avcodec/rasc: Check uncompressed dlta size
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 22 Jan 2019 23:16:02 +0000 (00:16 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 31 Jan 2019 16:28:23 +0000 (17:28 +0100)
We assume that if the compressed size is bigger than if each byte is encoded in a single raw packet
that the data is invalid.

Fixes: Out of memory
Fixes: 12208/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-5648916473708544

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f4079d5174c20eddbc99eef6ebe98d411f8014c5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/rasc.c

index 1b607ac..6e32c15 100644 (file)
@@ -353,6 +353,8 @@ static int decode_dlta(AVCodecContext *avctx,
     compression = bytestream2_get_le32(gb);
 
     if (compression == 1) {
+        if (w * h * s->bpp * 3 < uncompressed_size)
+            return AVERROR_INVALIDDATA;
         ret = decode_zlib(avctx, avpkt, size, uncompressed_size);
         if (ret < 0)
             return ret;