]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/hevc_sei: Check payload size in decode_nal_sei_message()
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2021 13:59:27 +0000 (14:59 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 10 Feb 2021 11:28:29 +0000 (12:28 +0100)
Fixes: out of array access
Fixes: 29392/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-4821602850177024.fuzz
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hevc_sei.c

index 227560c55b4dd2ba9bfd02bac4cae5bc77ce0d28..c881c4338c2e99bb114fe2248604fb7fe6d11053 100644 (file)
@@ -463,6 +463,8 @@ static int decode_nal_sei_message(GetBitContext *gb, void *logctx, HEVCSEI *s,
         byte          = get_bits(gb, 8);
         payload_size += byte;
     }
+    if (get_bits_left(gb) < 8LL*payload_size)
+        return AVERROR_INVALIDDATA;
     if (nal_unit_type == HEVC_NAL_SEI_PREFIX) {
         return decode_nal_sei_prefix(gb, logctx, s, ps, payload_type, payload_size);
     } else { /* nal_unit_type == NAL_SEI_SUFFIX */