From patchwork Mon Oct 4 22:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp4758083iob; Mon, 4 Oct 2021 15:25:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuY0+gBIgRXgevUTLotEkugNHxM+ohISBN9nLrZcI6wMwhk691567xygwW2LskndOX8YU+ X-Received: by 2002:a17:906:a14b:: with SMTP id bu11mr19414341ejb.260.1633386325536; Mon, 04 Oct 2021 15:25:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633386325; cv=none; d=google.com; s=arc-20160816; b=fqOi03OJEE4Aj7su1HAQk1+4B7y+iWaxzaqG4Zzt3l8HgXT8i/06UBA6FwZ3v9Y+Y8 dtrRQgHFA/HvCYF3jtJDbKzet3KEYtz23k26O4mAu0whGB2mfBXt6XmdjqkPwhoiz0Rv oKn/H13Qys97/k3pPP1+RLB5QAwBgxdp8BmcatsByR6wlRSy7GVKpaBnrQG/fhv9+i1S VU9WFcKECDyYj8snmJHcJNbty/VLPGTOYpLLFuUAKFTwjPxe4foAGBh1EsPwIOjoVqaV 9AQYrm2nrQ/BZs+8NzysgOwsU2y2gxcZGUzZctid6YEdVbYEaFJx9j677iAMAv0UckvN BijA== 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=1S/2dcvK7CBmJvls6qVNAfA0NleDlDF/DvkySEjtWG8=; b=V11Pgn0sPvZTtrldvVqsX5oB4L1cxQXvDa+TGaqrTR+BaEEXCwf0BjtxRkyhgKbzl5 x9oFZCYkc5JQTUW74uEmPAjo4e/nlxg3kp3+KbM/WHj9IoZUjFeQPJV7x+hYzdp3zG+y uq5UG5QgZblsLIBYJvQIEMW+XIl7eBViMBm/0OXcW8CEbQ58t2v9qCgBeB2x467d0T7d LtHVa6ih7gBmdtP9bDR8VXpQDUNZ5qcYlRLT/ySebH1YQ/SxyDBMJL6W7siYAipbvqQW vy9IIIM5bOjqK6KaC+MwecTGkThOFeybAwKW2LrweVjYujutDfN9vWFBoSXNLCERBYvI CJCA== 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 kf3si21255204ejc.366.2021.10.04.15.25.25; Mon, 04 Oct 2021 15:25:25 -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 1724668A69A; Tue, 5 Oct 2021 01:25:01 +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 EA45468A4CA for ; Tue, 5 Oct 2021 01:24:51 +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 1mXWOB-009xNi-0J for ffmpeg-devel@ffmpeg.org; Tue, 05 Oct 2021 00:24:51 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id XWNCmaebSljeHXWNCmAxpd; Tue, 05 Oct 2021 00:23:51 +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=_L8K5umGlh6AM6cddbQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Oct 2021 00:23:48 +0200 Message-Id: <20211004222350.29657-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMP/hXOIUMeFb5sbPFNqPxXUT7BAPs1Ui6UZ7Lwof6/L6S0GgCCCWr0XYpMd8c4IIBU9Z6geqdri3rf6KiQ+abCxT4WJ5qBuovhfTnvrrakAiYDyOEil gUs5Eb+ffVLW2EIa8xgCKn66x+PR6ulUDhWqbVlWuOfrEtyzVs9L3PAh Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/wmaprodec: Do not initialize unused variable to out of array value 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: ae8MmmgWcGcs Fixes: out of array read Fixes: 39452/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA2_fuzzer-4678745030524928.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wmaprodec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 7b489943f43..ba7bddc51ca 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1932,11 +1932,12 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data, for (i = 0; i < s->num_streams; i++) { const int start_ch = s->start_channel[i]; void *left[1] = { frame->extended_data[start_ch + 0] }; - void *right[1] = { frame->extended_data[start_ch + 1] }; av_audio_fifo_read(s->samples[0][i], left, nb_samples); - if (s->xma[i].nb_channels > 1) + if (s->xma[i].nb_channels > 1) { + void *right[1] = { frame->extended_data[start_ch + 1] }; av_audio_fifo_read(s->samples[1][i], right, nb_samples); + } } *got_frame_ptr = nb_samples > 0;