[FFmpeg-devel] avcodec/dxtory: Check slice_size against minimum in dxtory_decode_v2()

Submitted by Michael Niedermayer on April 15, 2019, 12:40 a.m.

Details

Message ID 20190415004007.19285-1-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer April 15, 2019, 12:40 a.m.
Fixes: Timeout (33sec -> 16 milli sec)
Fixes: 14181/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5681840708386816

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dxtory.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 7024b315d1..4dd675316b 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -286,8 +286,14 @@  static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
 
     off_check = off;
     gb_check = gb;
-    for (slice = 0; slice < nslices; slice++)
-        off_check += bytestream2_get_le32(&gb_check);
+    for (slice = 0; slice < nslices; slice++) {
+        slice_size = bytestream2_get_le32(&gb_check);
+
+        if (slice_size <= 16 + (avctx->height * avctx->width / (8 * nslices)))
+            return AVERROR_INVALIDDATA;
+        off_check += slice_size;
+    }
+
     if (off_check - avctx->discard_damaged_percentage*off_check/100 > src_size)
         return AVERROR_INVALIDDATA;