From patchwork Sun Mar 20 13:47:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921408nkc; Sun, 20 Mar 2022 06:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfBIKx4418PN6xvbLoDuUw1r1JGBStedO2mnsOcp2HmtbCBHPKCP9fD1mn3q5iv7RQrN/j X-Received: by 2002:a17:906:a08b:b0:6b9:2e20:f139 with SMTP id q11-20020a170906a08b00b006b92e20f139mr17303848ejy.463.1647784145745; Sun, 20 Mar 2022 06:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784145; cv=none; d=google.com; s=arc-20160816; b=RQAwi3PLtvfcX2vL5BOgm7sNI5SEaYxOmHx5bD6+SJZDyO0N8n8SldbIZ96NvLA5jO DKRMO0mt/N85N1IK7WnM1V5Wq8JPZRZRpHQxGHALBmIg/RkJh96x1InD5+mvfEICOkIR qT5tJjJpuYaHMCTpcqYBxTUyTJUt3rplzxFoQueo7hcFS9NTj+wBDOoXqO5D6qIlkcDq zmAtQYAAqpArw3Cz22NV+ShG0C/i2RBZbVyZmMSh+7ud0MrZUC7cXShjHsZDc0+oqXlH rETHpHAgagZ7aVZsj9XjaJ7fUj5mRD4zAh8BOTUyw8m//aksUA2rMNkMHVb0xQb7RGVK /eBg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=7QnSk0Sm38hH+uY9SGliYcyIJADuZZcwNiaUlTSyAD0=; b=KG+ZiA8ZQzWDihbRDus5jjuYTaq3gCJ8H1EB2CAumskAZoId3qWIDVf5jDnJp4/dsf Upvp2lIRGjPFk6hXDIO4hzQ+HeU4TpOtRoBspG4bNRmtGr6eBFsIfDn3p/vw/IcQY2X5 O3gP4oee/ehyPZQrOzpkxOQOSMXK9URiuJu1wvZkCo07To7tDU3mmXztPo53wyx6diTn wILuVyk6WzJHZZW2XaXYtKaSGl90p6/+3EKc5sH5cgWO62lXOFxXr8svOvfd8s5kj/Hl 2lEyKbGIj3wD7JlShhyybVY1ZlQxPFWv6Di8KRdQy/qGgrXqUJP+ymP/NLKlDPylAwzy NANA== 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 fb15-20020a1709073a0f00b006df7a784b52si4451957ejc.508.2022.03.20.06.49.04; Sun, 20 Mar 2022 06:49:05 -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 1023368B050; Sun, 20 Mar 2022 15:49:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C50B68A76A for ; Sun, 20 Mar 2022 15:48:55 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nVvvT-0000Ux-0m for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:48:55 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvtSn3zxHSgGFVvvTnIFU6; Sun, 20 Mar 2022 14:48:55 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id VvuGnXbpG8eSWVvuGnwTmf; Sun, 20 Mar 2022 14:47:40 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6237308b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=oWKpL2fnmQ2JKmIv1KcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:38 +0100 Message-Id: <20220320134739.28728-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320134739.28728-1-michael@niedermayer.cc> References: <20220320134739.28728-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfL+mVzQGbb5+umGNCfkc0KKFB1IFnfVwiDbK1N5YXNfRHxo/QubkD6nwIeET/pXOmL+EiM3PCLrRRaLOxSiYjcUJtjN6vL8en6X4Gs5cfg7DEg+N00Ps mQMBKfcrwa7c5sxF5FJY0MLbm2lGA3/Pm6081l8JMxtcHgFY1tboSw/Xz0cHPTnazbV3Rx/DjbCfGg== Subject: [FFmpeg-devel] [PATCH 3/4] avformat/apm: Check channels 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: sUNdoi9zY7JN Fixes: division by 0 Fixes: 45643/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4957777905188864.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/apm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 91eea86a57..baf7d2f941 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -140,7 +140,7 @@ static int apm_read_header(AVFormatContext *s) if (par->bits_per_coded_sample != 4) return AVERROR_INVALIDDATA; - if (channels > 2) + if (channels > 2 || channels == 0) return AVERROR_INVALIDDATA; av_channel_layout_default(&par->ch_layout, channels);