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 BD19C483C1 for ; Mon, 1 Apr 2024 02:00:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C98A68CD83; Mon, 1 Apr 2024 05:00:14 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F57868CD00 for ; Mon, 1 Apr 2024 05:00:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 49704240005 for ; Mon, 1 Apr 2024 02:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711936807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=dZik98kfySRuK+Yk1Y1rGTDLBm/m3WsY/JGGUdBa8dU=; b=KMNBwxtMI8TnXQCJIa4xzr8RxXCzKTz/f0yCgGCR8aFYuXewhaOLhSkNzVfIGwHDDXJuxx mkzDwnaZBrclmwImtDR8TeUxLBgUDkJ3VX3NLzLB4QUbGAn64CveDA5do71XR5rZHszYRm 83ZWOjMm44KqT6fEfASSLu+mSpJLPVM5BSywKZBVULBcKRHoNfR5RoKez0bakp9P6TkO/e ssjJKcUepNgykieG4SGpl7wbKizcsqx8i3M4Yd0ugAvDdRSHZUzldCXaw0Xkm0u/W29qu0 Ioo1Fix97U+7Pww/CjJ9kk0NOESmLXvZq5EUnho51pA0fwH2t8Fp/1KePf2qbA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Apr 2024 04:00:04 +0200 Message-Id: <20240401020006.12107-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/exr: Check for remaining bits in huf_unpack_enc_table() 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: Timeout Fixes: 67645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6308760977997824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 0f1f683e7e7..09f2fca109c 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -335,7 +335,10 @@ static int huf_unpack_enc_table(GetByteContext *gb, return ret; for (; im <= iM; im++) { - uint64_t l = freq[im] = get_bits(&gbit, 6); + uint64_t l; + if (get_bits_left(&gbit) < 6) + return AVERROR_INVALIDDATA; + l = freq[im] = get_bits(&gbit, 6); if (l == LONG_ZEROCODE_RUN) { int zerun = get_bits(&gbit, 8) + SHORTEST_LONG_RUN; -- 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".