[FFmpeg-cvslog] avcodec/rpza: Check that there is enough data for all the blocks

Michael Niedermayer git at videolan.org
Thu Mar 21 20:13:37 EET 2019


ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Sun Dec 16 19:13:27 2018 +0100| [90d73a207c6a8d7abe67114e143f06d11d519eeb] | committer: Michael Niedermayer

avcodec/rpza: Check that there is enough data for all the blocks

Fixes: Timeout
Fixes: 11547/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RPZA_fuzzer-5678435842654208

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90d73a207c6a8d7abe67114e143f06d11d519eeb
---

 libavcodec/rpza.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index cffbfe4416..8e1efa2445 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -105,6 +105,9 @@ static int rpza_decode_stream(RpzaContext *s)
     /* Number of 4x4 blocks in frame. */
     total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
 
+    if (total_blocks / 32 > bytestream2_get_bytes_left(&s->gb))
+        return AVERROR_INVALIDDATA;
+
     if ((ret = ff_reget_buffer(s->avctx, s->frame)) < 0)
         return ret;
     pixels = (uint16_t *)s->frame->data[0];



More information about the ffmpeg-cvslog mailing list