commit ae2537f53e8ebfa36345241b5b70c0b1aef66dd2
author Michael Niedermayer <michael@niedermayer.cc> Sun Apr 19 18:24:55 2020 +0200
committer Michael Niedermayer <michael@niedermayer.cc> Thu Apr 23 19:30:07 2020 +0200
tree e299f4c7b29d3bbe0d51e14ff8b044bf365e0852
parent e58766ba12bc86f54af1d8078cbe02f45b1686aa

avcodec/hevc_mp4toannexb_bsf: Check nalu_size

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

diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c
index baa9362..30f733d 100644
--- a/libavcodec/hevc_mp4toannexb_bsf.c
+++ b/libavcodec/hevc_mp4toannexb_bsf.c
@@ -144,6 +144,11 @@
         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 */