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 A0640400AB for ; Wed, 23 Mar 2022 10:54:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAAB768B15F; Wed, 23 Mar 2022 12:54:25 +0200 (EET) 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 1163E68A8A5 for ; Wed, 23 Mar 2022 12:54:20 +0200 (EET) 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 1nWxKO-0003uN-GC for ffmpeg-devel@ffmpeg.org; Wed, 23 Mar 2022 10:30:52 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WxE7nUbafSgGFWxKLnRFm9; Wed, 23 Mar 2022 10:30:50 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id WxK6npMuoOPqFWxK6nLAkA; Wed, 23 Mar 2022 10:30:34 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=623ae8c9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=VkvMtx6co3uGi7KOTpAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 23 Mar 2022 10:30:33 +0100 Message-Id: <20220323093033.24577-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323093033.24577-1-michael@niedermayer.cc> References: <20220323093033.24577-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNSRcuRylL5CwqrwE9Yqvje5E78282fjVKTvnrgPQNCUhMWc97E6zQtlsslz7gw2E9LVrDgEei8Axy8KXggc+lcrigCR5D3+WO7jEJXP9O+8lVP9gsb7 sNUM7pZfnpRTrx4TCk9Rg0CdPJog62CXpaRpK/nVB1RAMG384K7TpK23CXVS742b8Rp3Fd8+zfkTew== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: check allocated size for overflow 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: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 45891/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6159183893889024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 3634bb4960..c2b8e0dede 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -72,7 +72,12 @@ static int get_tag(AVIOContext *pb, uint32_t * tag) /* Metadata string read */ static void get_meta(AVFormatContext *s, const char *key, int size) { - uint8_t *str = av_malloc(size+1); + uint8_t *str; + + if (size == INT_MAX) + return; + + str = av_malloc(size+1); if (str) { int res = avio_read(s->pb, str, size); -- 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".