[FFmpeg-devel] [PATCH] avcodec/rscc: Check that the to be uncompressed input is large enough

Michael Niedermayer michael at niedermayer.cc
Sun Mar 31 18:31:17 EEST 2019


Fixes: Out of array access
Fixes: 13984/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-5734128093233152

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

diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index 7d4e842cd3..4adee9d7d4 100644
--- a/libavcodec/rscc.c
+++ b/libavcodec/rscc.c
@@ -199,6 +199,13 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
         /* If necessary, uncompress tiles, and hijack the bytestream reader */
         if (packed_tiles_size != tiles_nb * TILE_SIZE) {
             uLongf length = tiles_nb * TILE_SIZE;
+
+            if (bytestream2_get_bytes_left(gbc) < packed_tiles_size) {
+                av_log(avctx, AV_LOG_ERROR, "compressed input truncated\n");
+                ret = AVERROR_INVALIDDATA;
+                goto end;
+            }
+
             inflated_tiles = av_malloc(length);
             if (!inflated_tiles) {
                 ret = AVERROR(ENOMEM);
-- 
2.21.0



More information about the ffmpeg-devel mailing list