From patchwork Fri Jul 6 21:09:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9639 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp56782jad; Fri, 6 Jul 2018 14:10:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdTw81vt2QgLk+xA57nfrzKkh4/u9GuKyJnE2QbhVS21W1PthlPqmbRiIFPhiTAqwC/PcMD X-Received: by 2002:a1c:a103:: with SMTP id k3-v6mr7268624wme.161.1530911456610; Fri, 06 Jul 2018 14:10:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530911456; cv=none; d=google.com; s=arc-20160816; b=bdeiIRKw/poJxnl+EU9BZGelv+Ae2id8ThSg1BqLC9nhjilOIFW6//h1D8pmfI5u7c Rpx4i84guDaCIl0nmlNeHzN8k1VHNzfnkVnMDq6dVVjZu90lKCq37GXm4lUBXwFRYOCh hNCWc4FBohLPc/o2q0tVmi0h9lIUEjxRzSo3VUTKb1m3r9m399pzMdepRgFxB7gMgTq2 z+6jlUJJ2xPKsmhUR9Meak/f8QCVyWF/SCRNWRxJjQClpo7rjOGp+zoXoav7BqPSciE/ bPKp8fQAB2+d3TcSk8xQmdQp4aZ61U88AYxvi4LyIPyVxrror2aiK35reDeTdxHNUfBQ DtHg== 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=rXsZHrjTl/x4+jflDz5OeZKokCAU/J8PUDHANI2TiH4=; b=hPopOHI31xntGuaJoiR2fR948A6uwpszJXGds6Qwmce89AahfHYEL8sb4KjJzuNRfn /ewSl0s1rPncp0IwYh5zEDSUMBZ3mzKcH5dx0WN6JB8x0ETFlWfaWWG18HUrqTtGgThK piDNmgVJdSPBs9gkZYB21e7Lxgi+VvLyLM7DfylEht4/7xxpOxIbZnR4Ug1OqiKvHAtE mXiFlvg04Ji63eFsnQCWDfnEimzZu96ENFsq6QfSK/6LAV9joomdQbxT+ry+K0ihmaqf 2ZMdYoTc0dHnPGma273Fr0hZMkfAbbEUtLALjRNaUNG1rSvTyteA9XmlEZI7UfuWDCa+ Y5GA== 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 w14-v6si7094071wrq.390.2018.07.06.14.10.55; Fri, 06 Jul 2018 14:10:56 -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 6C26668A635; Sat, 7 Jul 2018 00:10:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5963E680A49 for ; Sat, 7 Jul 2018 00:10:41 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fbY05-0000TT-O3 for ffmpeg-devel@ffmpeg.org; Fri, 06 Jul 2018 23:10:45 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 7ZAh1y00R0S5wYM01ZAicS; Fri, 06 Jul 2018 23:10:42 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 6 Jul 2018 23:09:47 +0200 Message-Id: <20180706210947.2585-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: Check input sample count 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: division by 0 Fixes: fpe_movenc.c_199_1.wav Fixes: fpe_movenc.c_199_2.wav Fixes: fpe_movenc.c_199_3.wav Fixes: fpe_movenc.c_199_4.wav Fixes: fpe_movenc.c_199_5.wav Fixes: fpe_movenc.c_199_6.wav Fixes: fpe_movenc.c_199_7.wav Found-by: #CHEN HONGXU# Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index fe0a244a8f..78291a9adc 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5269,6 +5269,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) else samples_in_chunk = 1; + if (samples_in_chunk < 1) { + av_log(s, AV_LOG_ERROR, "fatal error, input packet contains no samples\n"); + return AVERROR_PATCHWELCOME; + } + /* copy extradata if it exists */ if (trk->vos_len == 0 && par->extradata_size > 0 && !TAG_IS_AVCI(trk->tag) &&