diff mbox

[FFmpeg-devel,2/3] avcodec/rpza: Check that there is enough data for all the blocks

Message ID 20181216204307.15575-2-michael@niedermayer.cc
State Accepted
Commit e63517e00a1a8375c7fb3b8c4c64c9a7c3da713e
Headers show

Commit Message

Michael Niedermayer Dec. 16, 2018, 8:43 p.m. UTC 
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@niedermayer.cc>
---
 libavcodec/rpza.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer Dec. 19, 2018, 10:29 a.m. UTC | #1 
On Sun, Dec 16, 2018 at 09:43:06PM +0100, Michael Niedermayer wrote:
> 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@niedermayer.cc>
> ---
>  libavcodec/rpza.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox

Patch

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];