diff mbox

[FFmpeg-devel] avformat/vividas: check length in read_vblock()

Message ID 20190612132359.30067-1-michael@niedermayer.cc
State Accepted
Commit d8716e3df9ee81909342b0b59f5b6eff052964fd
Headers show

Commit Message

Michael Niedermayer June 12, 2019, 1:23 p.m. UTC 
Fixes: out of array access
Fixes: 15166/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5731062396747776

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/vividas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer June 25, 2019, 9:01 a.m. UTC | #1 
On Wed, Jun 12, 2019 at 03:23:59PM +0200, Michael Niedermayer wrote:
> Fixes: out of array access
> Fixes: 15166/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5731062396747776
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/vividas.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]
diff mbox

Patch

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index c99cbd1f6e..ec20aabbae 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -205,7 +205,7 @@  static uint8_t *read_vblock(AVIOContext *src, uint32_t *size,
     decode_block(tmp, tmp, 4, key, k2, align);
 
     n = get_v(tmp);
-    if (!n)
+    if (n < 4)
         return NULL;
 
     buf = av_malloc(n);