From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2EEFB40855 for ; Sat, 2 Apr 2022 22:05:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C655668B21B; Sun, 3 Apr 2022 01:05:41 +0300 (EEST) 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 D8F4768B0D6 for ; Sun, 3 Apr 2022 01:05:35 +0300 (EEST) 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 1nals9-0009AQ-1q for ffmpeg-devel@ffmpeg.org; Sun, 03 Apr 2022 00:05:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id alqanGsx5SgGFals9npwK7; Sun, 03 Apr 2022 00:05:29 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id alrtnuWrk8eSWalrun8XSp; Sun, 03 Apr 2022 00:05:14 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6248c8a9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=MG81yj7za5pdsvtCDHYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Apr 2022 00:05:13 +0200 Message-Id: <20220402220513.1709-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220402220513.1709-1-michael@niedermayer.cc> References: <20220402220513.1709-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF2Mr0Q84IwiPqD+FJTQF8RrApDJniGJbXqCYwCWSYDV6gAatDH8WBK+uyWGl0fS9HihKahHU/nL0FheinQLxCNbW0Dj72N7fHo49jLwCi+WHl6N/Raz eS0DpcEv3W6u8COV4y87mlkhFG+LiXVzOV9y3Nq9VCMf1agj8CXuhGx2nQ0LOr6mNn48of2G1d8YRg== Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/binkaudio: Clear state on EAGAIN 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Its not supported to maintain a frame as receive_frame() argument over multiple calls Fixes: store to null pointer of type 'FFTSample' (aka 'float') Fixes: 46231/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_DCT_fuzzer-6276566037954560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/binkaudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index c4f3e743e2..f8cdc9f0cf 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -301,8 +301,10 @@ static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame) again: if (!s->pkt->data) { ret = ff_decode_get_packet(avctx, s->pkt); - if (ret < 0) + if (ret < 0) { + s->ch_offset = 0; return ret; + } if (s->pkt->size < 4) { av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".