From patchwork Thu Sep 26 21:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15324 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 DB39344A88E for ; Fri, 27 Sep 2019 00:12:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC04E68A63A; Fri, 27 Sep 2019 00:12:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60B99689A6F for ; Fri, 27 Sep 2019 00:12:29 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iDb3t-0006m7-1Y for ffmpeg-devel@ffmpeg.org; Thu, 26 Sep 2019 23:12:29 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Db2viKZKowlysDb2viGShe; Thu, 26 Sep 2019 23:11:29 +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=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=s3zEuOhG7oN1DS47fVgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 26 Sep 2019 23:10:56 +0200 Message-Id: <20190926211057.13232-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190926211057.13232-1-michael@niedermayer.cc> References: <20190926211057.13232-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfKKeSz+1X4HR+v2GwDshRoMwh2if1u5leXMzdB/6Cd2qDBnGUEnmd6nq0oJ9xqQUwrfKSXgfb3c/znoNYRsfrE94MQUJSDl0DabR3sPZ0yZleTs+yMyy iCbreZXsaRkhzHeVotXXqgLK8NG+xidUATTJbbNWa98y8YMhWbwtJJsg Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/smacker: cleanup on errors in smka_decode_frame() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: multiple memleaks Fixes: 17660/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKAUD_fuzzer-5689769928949760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/smacker.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index a2950c455b..901cdb1fb1 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -721,8 +721,10 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, for(i = 0; i <= stereo; i++) *samples++ = pred[i]; for(; i < unp_size / 2; i++) { - if(get_bits_left(&gb)<0) - return AVERROR_INVALIDDATA; + if(get_bits_left(&gb)<0) { + ret = AVERROR_INVALIDDATA; + goto error; + } if(i & stereo) { if(vlc[2].table) res = get_vlc2(&gb, vlc[2].table, SMKTREE_BITS, 3); @@ -730,7 +732,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } val = h[2].values[res]; if(vlc[3].table) @@ -739,7 +742,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } val |= h[3].values[res] << 8; pred[1] += sign_extend(val, 16); @@ -751,7 +755,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } val = h[0].values[res]; if(vlc[1].table) @@ -760,7 +765,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } val |= h[1].values[res] << 8; pred[0] += sign_extend(val, 16); @@ -773,8 +779,10 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, for(i = 0; i <= stereo; i++) *samples8++ = pred[i]; for(; i < unp_size; i++) { - if(get_bits_left(&gb)<0) - return AVERROR_INVALIDDATA; + if(get_bits_left(&gb)<0) { + ret = AVERROR_INVALIDDATA; + goto error; + } if(i & stereo){ if(vlc[1].table) res = get_vlc2(&gb, vlc[1].table, SMKTREE_BITS, 3); @@ -782,7 +790,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } pred[1] += sign_extend(h[1].values[res], 8); *samples8++ = pred[1]; @@ -793,7 +802,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, res = 0; if (res < 0) { av_log(avctx, AV_LOG_ERROR, "invalid vlc\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto error; } pred[0] += sign_extend(h[0].values[res], 8); *samples8++ = pred[0];