From patchwork Thu Sep 24 20:20:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22577 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0C8DD44A811 for ; Thu, 24 Sep 2020 23:21:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E00CB68B98D; Thu, 24 Sep 2020 23:21:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D082768B8F0 for ; Thu, 24 Sep 2020 23:21:41 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kLXkL-00050C-0H for ffmpeg-devel@ffmpeg.org; Thu, 24 Sep 2020 22:21:41 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id LXjNkWzvhIr7GLXjNkDg9t; Thu, 24 Sep 2020 22:20:41 +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=QN4WuTDL 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=nZOtpAppAAAA:20 a=z9qjW-vrs-0mbkv5k7cA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 24 Sep 2020 22:20:39 +0200 Message-Id: <20200924202039.30285-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200924202039.30285-1-michael@niedermayer.cc> References: <20200924202039.30285-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPuLMM40iVXYxxW8n3GHcvm6o3gzhjheAGLggP/ohcekKy3Z9+f9L3jSrc8EGVzMuMzJX5qAKCJ8LDGnJUKrXEV/haUZppxWZPFxBZV5auJC2qw8/b4j GQuDZBLwaMRnvmcjskooEGQb8ceRRfkmr48MVnzSynAG/iB+PbRRgsfB Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/sonic: Check channels before deallocating 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: heap-buffer-overflow Fixes: 25744/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-5172961169113088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/sonic.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index fa4ecc3a7a..d09de6156b 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -980,12 +980,11 @@ static av_cold int sonic_decode_close(AVCodecContext *avctx) av_freep(&s->int_samples); av_freep(&s->tap_quant); av_freep(&s->predictor_k); - - for (i = 0; i < s->channels; i++) - { - av_freep(&s->predictor_state[i]); - av_freep(&s->coded_samples[i]); - } + if (s->channels <= MAX_CHANNELS) + for (i = 0; i < s->channels; i++) { + av_freep(&s->predictor_state[i]); + av_freep(&s->coded_samples[i]); + } return 0; }