summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-03-31 17:31:17 +0200
committerMichael Niedermayer <[email protected]>2019-11-11 20:18:45 +0100
commitc3f1cd8869c37f0f841c668ddf48090101c79181 (patch)
tree537a6856f79db82bfb7e56b13c4f507550e74656
parent25d1d5929fdb4970b23eb8b647c7377aa5212732 (diff)
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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3a0ec1511e7040845a0d1ce99fe2f30a0972b6d2) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/rscc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index dae5e84634..b8a65aa315 100644
--- a/libavcodec/rscc.c
+++ b/libavcodec/rscc.c
@@ -188,6 +188,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);