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 12D49499B3 for ; Tue, 26 Mar 2024 02:31:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CA7E68D5FA; Tue, 26 Mar 2024 04:31:09 +0200 (EET) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A54868D4CB for ; Tue, 26 Mar 2024 04:31:01 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 66BA340003 for ; Tue, 26 Mar 2024 02:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711420260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=zcl+Z9IcwQmKOpJg7Gg8wjxBJ+Z8xdIL3xl46PshDx0=; b=U3/qqEfuzXIoKd1P5xGfnYaYkQsw6I7XiDe9kUJk/1MV4QokO/2wOCCW+zhYibEFEZSfA7 rK2uYROnCHXkypDqDkz8KsubeiX/jR64KeTZdYn9ZwYKe2S1eB4oU8BE0B3GpQFeZspHdX XJj8PgQ/nVnF0HCvzWdmuNjRETmliucDEVLDBn3nblhulci26cFdySX20d5fXhZ+ayrunX ZqENq7Bf9aGgJuFXZwcgrOxfSLwdYv0ahcHQr7qQdRrl273zF8PomW6OWjr6qH8AdOubQD NvTJ/klYq2/S5WCc2P6PVidrDIkMjA0miaM5bP+gQykbnok+wZo5NsUalvWUXQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 03:30:53 +0100 Message-Id: <20240326023056.20548-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240326023056.20548-1-michael@niedermayer.cc> References: <20240326023056.20548-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/rtv1: fix undefined FFALIGN 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 + 4 cannot be represented in type 'int' Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RTV1_fuzzer-6324303861514240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rtv1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/rtv1.c b/libavcodec/rtv1.c index 06afe9e873c..807c8a34666 100644 --- a/libavcodec/rtv1.c +++ b/libavcodec/rtv1.c @@ -113,6 +113,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, width = bytestream2_get_le32(&gb); height = bytestream2_get_le32(&gb); + if (width > INT_MAX-4U || height > INT_MAX-4U) + return AVERROR_INVALIDDATA; ret = ff_set_dimensions(avctx, FFALIGN(width, 4), FFALIGN(height, 4)); if (ret < 0) return ret; -- 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".