]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/rasc: Check input space before reading chunk
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 5 Dec 2018 01:18:51 +0000 (02:18 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 14 Dec 2018 22:24:20 +0000 (23:24 +0100)
Fixes: Timeout
Fixes: 11118/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-5652564066959360
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/rasc.c

index e8e0740ddd5f3fa9888a94914aadc4b806d45e73..67351dfd19a6d742d80b84cdef6d3810567a4dbc 100644 (file)
@@ -680,6 +680,9 @@ static int decode_frame(AVCodecContext *avctx,
     while (bytestream2_get_bytes_left(gb) > 0) {
         unsigned type, size = 0;
 
+        if (bytestream2_get_bytes_left(gb) < 8)
+            return AVERROR_INVALIDDATA;
+
         type = bytestream2_get_le32(gb);
         if (type == KBND || type == BNDL) {
             intra = type == KBND;