aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-03-31 17:31:17 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-04-01 10:32:08 +0200
commit6c75df556f8ce97398789f363f5b323ae3abc920 (patch)
treed77deff9fb0d2b2f6b4c8e412938310246e320cf
parent58cd70201edc57b46fb4ad8c0810725f0bf80c86 (diff)
downloadffmpeg-6c75df556f8ce97398789f363f5b323ae3abc920.tar.gz
avcodec/rscc: Check that the to be uncompressed input is large enough
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 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3a0ec1511e7040845a0d1ce99fe2f30a0972b6d2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/rscc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index 7921f149ed..69cb702777 100644
--- a/libavcodec/rscc.c
+++ b/libavcodec/rscc.c
@@ -198,6 +198,12 @@ 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) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
inflated_tiles = av_malloc(length);
if (!inflated_tiles) {
ret = AVERROR(ENOMEM);