From patchwork Mon Mar 21 20:19:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34881 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1960582nkc; Mon, 21 Mar 2022 13:21:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0Vbo1rECbSAHGv3RNJcuRcShqTHoaFYne4HbkZLCOjthO3Isq6fi59x0vKDc3W1yK0DMX X-Received: by 2002:a05:6402:4402:b0:418:ff4c:f102 with SMTP id y2-20020a056402440200b00418ff4cf102mr22582018eda.365.1647894072808; Mon, 21 Mar 2022 13:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647894072; cv=none; d=google.com; s=arc-20160816; b=egGYPOTJYH049dsu9c6zzGomxBVOWC7lHNzgT8IXIO5VNbygyprisf1Ci2iBCtv3Ta /3DSERZHUD/GytuaUbC5TbKmzWEOzor+x1Ki/7nuKEM7hF527eNwaznha6oYd1++JnGH MY8ENPO3fBG9SRkO9mlIYAVuD+tpTjeywh+a92Re+5KsOPoLsOUq8fXQft53c2RlR6BE XKd3f0wmj/2oVKSe6CJU+mvXCM63oRRfPPb0mZ842JqNRaa1NiOOXzFHefQSnHoM+VwD dtUFm0+08I3aAOlZq7p3jYYuVUGPwYhh2yoCO6X723G6rkqH140JiV1VrUmvHbzwrwIg v0fw== 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=FGStjM8kd7CjB2YbqciRp6hgYn9FXfQ9zqGtuIafrPk=; b=ip3OCk/TMVvqGFryKYJE2E9Doe7z/FDQPw5TneMw9EV20+Q72AgSuRkWkN5Mk4yz2A W8Fc2QW++8nZ5udrMqZykVsiEmXsY//Xu1spbrrsD3KhmZTCNkm7sERbEFa9+MP/Fnx6 Dwax5anUMWQsGdzhKiT5NT5QiincOpgqLdSXhrbNWs5xQeBE8AjXjjA6tAVvky8sVnEV dSH1BlEKOnkFRr5QyU28Y6ICWoaVL9D49MBUJtHLbk+FTGGwpg8EL/P8KU2T5QIogm0b d1RuHgGEOx3DcXOoy/r3IIddrUWAOlqwCKB8gkfHVUYzh5/zqb8iV24cBfYXxYhPTQPK 95lQ== 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 c3-20020a1709063f0300b006df76385caasi8166884ejj.330.2022.03.21.13.21.12; Mon, 21 Mar 2022 13:21:12 -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 5ACD568B174; Mon, 21 Mar 2022 22:21:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C32268A656 for ; Mon, 21 Mar 2022 22:21:03 +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 1nWOWV-00030k-57 for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 21:21:03 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WOWVnckp4SgGFWOWVnNAap; Mon, 21 Mar 2022 21:21:03 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id WOVInVhDYOPqFWOVInJl7S; Mon, 21 Mar 2022 21:19:48 +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=OcX7sjfY c=1 sm=1 tr=0 ts=6238ddf2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=kaLpC4Z-mZCZhcdI_14A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 21:19:44 +0100 Message-Id: <20220321201946.16919-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220321201946.16919-1-michael@niedermayer.cc> References: <20220321201946.16919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKH3XT/GAoipflDQbUD5paxHMRtRRiGJPlSG06RdRt3aHfKe8xLXfMLtp+zeIgB4Xv+DcOYplhSjH74kRVH03tqE011dcDwn9Cnumw60FXEFv392o1r/ tufZibxenBswwVdK1v3NJiI4RZ/GLgnr6JSCzCT4ETunA8O7OXVNCeuOJr7dO4adfDjZTap43VLFXg== Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/vmdaudio: Fix channels count bug 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: p+R6/oAKSZtt Fixes: division by zero Fixes: 45811/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VMDAUDIO_fuzzer-6412592581574656 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vmdaudio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c index 045a2da410..875930061a 100644 --- a/libavcodec/vmdaudio.c +++ b/libavcodec/vmdaudio.c @@ -85,7 +85,7 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx) } av_channel_layout_uninit(&avctx->ch_layout); - av_channel_layout_default(&avctx->ch_layout, channels == 1); + av_channel_layout_default(&avctx->ch_layout, channels); if (avctx->bits_per_coded_sample == 16) avctx->sample_fmt = AV_SAMPLE_FMT_S16;