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 3DACE402F8 for ; Mon, 23 May 2022 00:35:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B18E068B4BA; Mon, 23 May 2022 03:35:44 +0300 (EEST) Received: from vie01a-dmta-at03-1.mx.upcmail.net (unknown [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FF5768B072 for ; Mon, 23 May 2022 03:35:38 +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 1nsw2l-000789-6y for ffmpeg-devel@ffmpeg.org; Mon, 23 May 2022 02:35:31 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id sw1RnY3iH8s8Usw2knJ76C; Mon, 23 May 2022 02:35:30 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id sw2knxqgq8eSWsw2knzLEU; Mon, 23 May 2022 02:35:30 +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=628ad6d2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=7eOq1tfR8qfLTMvAqp8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 May 2022 02:35:28 +0200 Message-Id: <20220523003529.21527-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfF4z72JJ98bbpzHQawyNLgbd46212vxAXi5w9iQenYzeWbGxzuYuULhFaod1+bpLHRZn0lLKPOfYV5mBHYsIhSdSP1kihiPhnM0RtRpwKEdnSxganSZi fA3hbOkeHaYfqbS6LyU02rkaSZprWSxW+NSP3K7oHSQr2xfqjV8CqGGZtG//RTjZY7XkS2DPT6hC7Q== Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/flashsv: Check inflate() for failure 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: Fixes: CID1047223 Signed-off-by: Michael Niedermayer --- libavcodec/flashsv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 0982161d49..d8943d9cf8 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -149,7 +149,9 @@ static int flashsv2_prime(FlashSVContext *s, const uint8_t *src, int size) zstream->avail_in = size; zstream->next_out = data; zstream->avail_out = s->block_size * 3; - inflate(zstream, Z_SYNC_FLUSH); + zret = inflate(zstream, Z_SYNC_FLUSH); + if (zret != Z_OK && zret != Z_STREAM_END) + return AVERROR_UNKNOWN; remaining = s->block_size * 3 - zstream->avail_out; if ((zret = inflateReset(zstream)) != Z_OK) { @@ -165,7 +167,9 @@ static int flashsv2_prime(FlashSVContext *s, const uint8_t *src, int size) * out of the output from above. See section 3.2.4 of RFC 1951. */ zstream->next_in = zlib_header; zstream->avail_in = sizeof(zlib_header); - inflate(zstream, Z_SYNC_FLUSH); + zret = inflate(zstream, Z_SYNC_FLUSH); + if (zret != Z_OK) + return AVERROR_UNKNOWN; while (remaining > 0) { unsigned block_size = FFMIN(UINT16_MAX, remaining); uint8_t header[5]; -- 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".