avcodec/gdv: Error out if we had insufficent input for the output frame in decompress_2()
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 5 Aug 2018 15:22:23 +0000 (17:22 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 27 Sep 2018 23:25:17 +0000 (01:25 +0200)
Fixes: Timeout (with the previous commits to gdv.c)
Fixes: 9422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5143490001371136

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

index d497f76..b54f737 100644 (file)
@@ -230,6 +230,10 @@ static int decompress_2(AVCodecContext *avctx)
             break;
         }
     }
+
+    if (bytestream2_get_bytes_left_p(pb) > 0)
+        return AVERROR_INVALIDDATA;
+
     return 0;
 }
 
@@ -458,6 +462,8 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
     default:
         av_assert0(0);
     }
+    if (ret < 0)
+        return ret;
 
     memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);
     dst = frame->data[0];