[FFmpeg-cvslog] avformat/vividas: Check packet size
Michael Niedermayer
git at videolan.org
Thu Feb 23 23:19:55 EET 2023
ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Sun Sep 18 19:14:07 2022 +0200| [11d07808bc8a6fe99ab11887ba38625146d83c44] | committer: Michael Niedermayer
avformat/vividas: Check packet size
Fixes: signed integer overflow: 119760682 - -2084600173 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-6745781167587328
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 5f44489cc5d4f3767f6ad2ad067ee6a3f78374bb)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d07808bc8a6fe99ab11887ba38625146d83c44
---
libavformat/vividas.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index e9954f73ed..ed4e573df8 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -683,6 +683,7 @@ static int viv_read_packet(AVFormatContext *s,
if (viv->sb_entries[viv->current_sb_entry].flag == 0) {
uint64_t v_size = ffio_read_varlen(pb);
+ int last = 0, last_start;
if (!viv->num_audio)
return AVERROR_INVALIDDATA;
@@ -706,12 +707,18 @@ static int viv_read_packet(AVFormatContext *s,
if (i > 0 && start == 0)
break;
+ if (start < last)
+ return AVERROR_INVALIDDATA;
viv->n_audio_subpackets = i + 1;
+ last =
viv->audio_subpackets[i].start = start;
viv->audio_subpackets[i].pcm_bytes = pcm_bytes;
}
+ last_start =
viv->audio_subpackets[viv->n_audio_subpackets].start = (int)(off - avio_tell(pb));
+ if (last_start < last)
+ return AVERROR_INVALIDDATA;
viv->current_audio_subpacket = 0;
} else {
More information about the ffmpeg-cvslog
mailing list