[FFmpeg-cvslog] avcodec/rscc: Check that the to be uncompressed input is large enough
Michael Niedermayer
git at videolan.org
Fri May 10 22:03:18 EEST 2019
ffmpeg | branch: release/3.2 | Michael Niedermayer <michael at niedermayer.cc> | Sun Mar 31 17:31:17 2019 +0200| [544f5fce12b8c305d9774c7be086c47fd76191f9] | committer: Michael Niedermayer
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 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 3a0ec1511e7040845a0d1ce99fe2f30a0972b6d2)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=544f5fce12b8c305d9774c7be086c47fd76191f9
---
libavcodec/rscc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index 97822b0974..c744349693 100644
--- a/libavcodec/rscc.c
+++ b/libavcodec/rscc.c
@@ -181,6 +181,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);
More information about the ffmpeg-cvslog
mailing list