]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dxv: Check remaining space in CHECKPOINT()
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 20 Mar 2019 21:29:21 +0000 (22:29 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 28 Mar 2019 20:32:31 +0000 (21:32 +0100)
Fixes: Timeout (77sec -> 1sec)
Fixes: 13407/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5093143018471424
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dxv.c

index aef5ec19dd6b6970d91fd264698a10ce6bbfde7f..6fe5516505a157b4767e746e98fc156aa0e20793 100644 (file)
@@ -256,6 +256,8 @@ static int decompress_texture_thread(AVCodecContext *avctx, void *arg,
 #define CHECKPOINT(x)                                                         \
     do {                                                                      \
         if (state == 0) {                                                     \
+            if (bytestream2_get_bytes_left(gbc) < 4)                          \
+                return AVERROR_INVALIDDATA;                                   \
             value = bytestream2_get_le32(gbc);                                \
             state = 16;                                                       \
         }                                                                     \