avcodec/agm: Check that there is available input in read_code()
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 2 Apr 2019 18:27:13 +0000 (20:27 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 24 Apr 2019 15:05:02 +0000 (17:05 +0200)
Fixes: Timeout (46sec -> 7ms)
Fixes: 14030/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5721258760601600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/agm.c

index 7dcfaff..332e338 100644 (file)
@@ -103,6 +103,9 @@ static int read_code(GetBitContext *gb, int *oskip, int *level, int *map, int mo
 {
     int len = 0, skip = 0, max;
 
+    if (get_bits_left(gb) < 2)
+        return AVERROR_INVALIDDATA;
+
     if (show_bits(gb, 2)) {
         switch (show_bits(gb, 4)) {
         case 1: