From patchwork Tue Oct 5 20:51:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30913 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5774568iob; Tue, 5 Oct 2021 13:52:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzgeVuavKQxMo8wFGpylshW58sLj57AJX4kXR/tpguqaTKPTQ9Os/24Eb8laywUDHI2ZbO X-Received: by 2002:aa7:d50a:: with SMTP id y10mr5143579edq.160.1633467156219; Tue, 05 Oct 2021 13:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633467156; cv=none; d=google.com; s=arc-20160816; b=Csv7Lb5dkSR1DYRe86JZGuVeOvA9kHKluBt/wGult9G5JHP8KDJfgxXK0nThrf3Mfm NcWtUSLbooiF+gdtFAgRvqJUz9Lz7WnZCW1vCMSjp95K70uFbk58QvBRaY526o5SLfSd WlMVKDGcuj8bomjda1M0goLP3+iW5wATgPD2P07w/Zbe+RJw2GVwDqJM2QaaGyqA74pF qvw666QvRw/L5ktf7991gUNB3EZP7g7qDE3rKfQDwK6dXa8KYTTArnxS3EzLe2wxzaCe LSAACm+pCuuw+0628z0UtEuslGCOM05i2WTvvSl5Jutkda8jG0fWe3KRPMl1OcpBDjrC Qn+Q== 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; bh=MqS9wcSeODKoqoJouwEmbnLdvNn9XqEEoAVh88/BgLk=; b=O/M80013SuePccoM9h3i/OHuxnueFpZoYw2CH5K8PyC5xPTIoKgxqzXdhyww5tdYC2 6exMySvzCLX5g+9muGGNo+JDLsKIMdXBzi3MHwqX5kRAQT61vl8o9NW6WOH2NuSK4PlQ 86O8MtLJN2UCEau4TBaNyjNycE/Jb+QfA5+S3Ld9ftbplh3e1gyrXPkVHlnSU8MWsxuD hXojSRLuBM7FW4xvplFcmwq/XftYd/QQmp/INMqsbkkno8zDeg6YXtl0OZN9z7paq0mB yIYGImAu9HqDuvVx66T5ojaPIzvYLkoOcnt7mGUvteFtZx3lVxWrTApwym3FB4J7K2qy ByVQ== 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 h2si7984699ejj.419.2021.10.05.13.52.35; Tue, 05 Oct 2021 13:52:36 -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 2DE1D68A920; Tue, 5 Oct 2021 23:52:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAEA468A8DC for ; Tue, 5 Oct 2021 23:52:26 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mXrQI-00C8Dx-0D for ffmpeg-devel@ffmpeg.org; Tue, 05 Oct 2021 22:52:26 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id XrPJmR07TljeHXrPJmkw5W; Tue, 05 Oct 2021 22:51:26 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=WljO-lYazi3hDXzC5b8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Oct 2021 22:51:25 +0200 Message-Id: <20211005205125.4831-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfH4N/7jmyvoWFh7Ltjtn4gVp4U/bDmvVZHSfbgrGFp7hOg3CGb1g0PuyaIY4WMjO+9w0tVP9HzJaM+Ro6EoCu5lUV+FMv/brCIdyoFdC55foG5L6M69F q6c3vDtTT+63UaGUPRAFJx6BY4kC3IYOvGxOGofgNzE1/J5uv6jjnd79 Subject: [FFmpeg-devel] [PATCH] avcodec/amr_parser: passthrough if channels is unknown X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: cMVSSm2h/NSa Fixes: division by 0 Fixes: 39562/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMRWB_fuzzer-5448834960982016 Fixes: 39589/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMRWB_fuzzer-6119205334810624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/amr_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/amr_parser.c b/libavcodec/amr_parser.c index 79258d4d0cf..9fb7711fee0 100644 --- a/libavcodec/amr_parser.c +++ b/libavcodec/amr_parser.c @@ -62,7 +62,7 @@ static int amr_parse(AVCodecParserContext *s1, *poutbuf_size = 0; *poutbuf = NULL; - if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) { + if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES || !avctx->channels) { next = buf_size; } else { int ch, offset = 0;