[FFmpeg-devel] [PATCH 3/3] avformat/vividas: Fix n_sb_blocks Check
Michael Niedermayer
michael at niedermayer.cc
Tue Oct 15 02:48:40 EEST 2019
Fixes: signed integer overflow: 1540265776 * 2 cannot be represented in type 'int'
Fixes: 18160/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5758808818712576
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavformat/vividas.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index efe1b8deff..ab3947815a 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -438,7 +438,7 @@ static int track_index(VividasDemuxContext *viv, AVFormatContext *s, uint8_t *bu
ffio_read_varlen(pb); // track_index_len
avio_r8(pb); // 'c'
viv->n_sb_blocks = ffio_read_varlen(pb);
- if (viv->n_sb_blocks * 2 > size)
+ if (viv->n_sb_blocks < 0 || viv->n_sb_blocks > size / 2)
goto error;
viv->sb_blocks = av_calloc(viv->n_sb_blocks, sizeof(VIV_SB_block));
if (!viv->sb_blocks) {
--
2.23.0
More information about the ffmpeg-devel
mailing list