aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-18 19:14:07 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-09 21:33:12 +0200
commit6447e6bb092aa5eac9ad0678ba1a81d371f1b978 (patch)
treeb0f417e72f4edf9a3bf58f6559745ac1e69009e4
parent23d078dbd1144688fb4982fd32a3c9076ccd83cc (diff)
downloadffmpeg-6447e6bb092aa5eac9ad0678ba1a81d371f1b978.tar.gz
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@niedermayer.cc> (cherry picked from commit 5f44489cc5d4f3767f6ad2ad067ee6a3f78374bb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/vividas.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index f530034736..c2141587d4 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -684,6 +684,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;
@@ -707,12 +708,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 {