[FFmpeg-cvslog] avcodec/hevc/ps: Fix dependant layer id check

Michael Niedermayer git at videolan.org
Sun Jun 22 16:05:16 EEST 2025


ffmpeg | branch: release/7.1 | Michael Niedermayer <michael at niedermayer.cc> | Thu May  8 23:46:04 2025 +0200| [dd21a1462e0846bd892b4089a84b6bd946c27bcc] | committer: Michael Niedermayer

avcodec/hevc/ps: Fix dependant layer id check

Fixes: shift exponent 49 is too large for 32-bit type 'int'
Fixes: 398060145/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5023082406543360

Reviewed-by: James Almer <jamrial at gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 4e5523c98597a417eb43555933b1075d18ec5f8b)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd21a1462e0846bd892b4089a84b6bd946c27bcc
---

 libavcodec/hevc/ps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c
index f18b88489b..8b48cba8e0 100644
--- a/libavcodec/hevc/ps.c
+++ b/libavcodec/hevc/ps.c
@@ -612,8 +612,8 @@ static int decode_vps_ext(GetBitContext *gb, AVCodecContext *avctx, HEVCVPS *vps
     }
 
     /* Consequence of established layer dependencies */
-    if (layer1_id_included != ((1 << vps->layer_id_in_nuh[0]) |
-                               (1 << vps->layer_id_in_nuh[1]))) {
+    if (layer1_id_included != ((1ULL << vps->layer_id_in_nuh[0]) |
+                               (1ULL << vps->layer_id_in_nuh[1]))) {
         av_log(avctx, AV_LOG_ERROR, "Dependent layer not included in layer ID?\n");
         return AVERROR_PATCHWELCOME;
     }



More information about the ffmpeg-cvslog mailing list