]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/hevc_mp4toannexb_bsf: Check nalu_size
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Apr 2020 16:24:55 +0000 (18:24 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Apr 2020 17:30:07 +0000 (19:30 +0200)
Fixes: Timeout (29sec -> 5ms)
Fixes: 20237/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_MP4TOANNEXB_fuzzer-5165615044362240
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_mp4toannexb_bsf.c

index baa93628ed205a6b613330fd189d775c5c10754d..30f733d77547a8c7ce60a019174e78413c2dec01 100644 (file)
@@ -144,6 +144,11 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out)
         for (i = 0; i < s->length_size; i++)
             nalu_size = (nalu_size << 8) | bytestream2_get_byte(&gb);
 
+        if (nalu_size < 2) {
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
+
         nalu_type = (bytestream2_peek_byte(&gb) >> 1) & 0x3f;
 
         /* prepend extradata to IRAP frames */