diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-22 00:37:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:21 +0100 |
| commit | c486ec5d0b5995b3e5806f85d888e145bee9de7a (patch) | |
| tree | e72928179e1968827d716d74bb06440b3196b791 | |
| parent | 837477a755aa0da3e4dfa83a8c40f3bed7c35bea (diff) | |
| download | ffmpeg-c486ec5d0b5995b3e5806f85d888e145bee9de7a.tar.gz | |
avformat/vividas: Check for zero v_size
Fixes: SEGV on unknown address 0x000000000000
Fixes: 26482/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-4905102324006912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c7a5face77878ef0169a56a46d4320a41d52d3b5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/vividas.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 3793f74c0d..bd0b6beb71 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -677,7 +677,7 @@ static int viv_read_packet(AVFormatContext *s, return AVERROR_INVALIDDATA; ffio_read_varlen(pb); - if (v_size > INT_MAX) + if (v_size > INT_MAX || !v_size) return AVERROR_INVALIDDATA; ret = av_get_packet(pb, pkt, v_size); if (ret < 0) @@ -706,7 +706,7 @@ static int viv_read_packet(AVFormatContext *s, } else { uint64_t v_size = ffio_read_varlen(pb); - if (v_size > INT_MAX) + if (v_size > INT_MAX || !v_size) return AVERROR_INVALIDDATA; ret = av_get_packet(pb, pkt, v_size); if (ret < 0) |