From patchwork Sat Jul 28 13:16:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9833 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1920971jad; Sat, 28 Jul 2018 06:16:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdkuNGLWhAq51BjchLUU2io1oGTvkMi4w2rysk+zZGYREVcR11i5zTDB0lBTc6kl6I/84fq X-Received: by 2002:adf:9366:: with SMTP id 93-v6mr9448078wro.60.1532783801368; Sat, 28 Jul 2018 06:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532783801; cv=none; d=google.com; s=arc-20160816; b=bk6v3wdQ7BPBgmFMS3BTsEsrB1onJh2+OSofR9/XMBg81tprGcPZA8wgrakPhxT/c7 NV9HlyAvoPPFrlB68ISZtqFAjVdfF3HHhvXSIexl0fEdWq9IvMOLx/JUA29tpaUm6RFl 1lFdsTJ29JpEt6j866DeDuTU3OUiKkSLGo9vcgg9iZTjYRJD3GHswFAF3mE/iclUO4ji VEef/MC78+lykWRaCifEkKHgDNE7MYSD1iiJpwQy1935RgfdlFd/+fW5mfwmL8siew5s mE7K586mC8quxPvuZPTzTWZYgBEMwcHHuqmmTFauQY5RPrggpoLdIjr3ZdOfn4IkgjOq 4J1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=gJ2I69OTPLuZMe+KufxQE8joxdgOM2BGCqQZ+8ZOGzI=; b=QvhNl4uVCFwIWiTiLCnVlTOmJG9QOur7RzlFkdewdUtsmyZbOzE6o7Bq76GfK+BrxO AjSLpo6oBj9O9tw/5kJlxor9kycOWp+vtHwI6CbeRA0nW4QhRDxDgfigXspgAlGdVrHT 9CWcnteb2WpzNCLVZIxjbwwm4JQ9aFnAgZ2Gw+wPrYTkOC+i9ctDZFXYI3l6YTYihJo0 kply7GYYq9Q73xap2S0bpRLUV/TOkxcR2cZm11g0StekWpHL6ZKnhfxisrNuizhU39R0 T1lY9irPmghZkPypGD8xBRUM3fwtt51+TQ4qkCdtbWvFsO5QX7sJUPgdDAE+KsyYpSJq 7dHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h144-v6si5738142wme.116.2018.07.28.06.16.41; Sat, 28 Jul 2018 06:16:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 00E5B689CB4; Sat, 28 Jul 2018 16:16:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 537DF689B63 for ; Sat, 28 Jul 2018 16:16:17 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fjP5F-0008Ku-19 for ffmpeg-devel@ffmpeg.org; Sat, 28 Jul 2018 15:16:33 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id GDGX1y01a0S5wYM01DGYR7; Sat, 28 Jul 2018 15:16:33 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 28 Jul 2018 15:16:09 +0200 Message-Id: <20180728131609.16663-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] avformat/flvenc: Check audio packet size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Assertion failure Fixes: assert_flvenc.c:941_1.swf Found-by: #CHEN HONGXU# Signed-off-by: Michael Niedermayer --- libavformat/flvenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1c552a3e6b..e4863f1fc7 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) int flags = -1, flags_size, ret; int64_t cur_offset = avio_tell(pb); + if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) { + av_log(s, AV_LOG_WARNING, "Empty audio Packet\n"); + return AVERROR(EINVAL); + } + if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) flags_size = 2;