Skip to content
Snippets Groups Projects
Unverified Commit 6447e6bb authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5f44489c)
Signed-off-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parent 23d078db
No related branches found
Tags n4.0.1
No related merge requests found
...@@ -684,6 +684,7 @@ static int viv_read_packet(AVFormatContext *s, ...@@ -684,6 +684,7 @@ static int viv_read_packet(AVFormatContext *s,
if (viv->sb_entries[viv->current_sb_entry].flag == 0) { if (viv->sb_entries[viv->current_sb_entry].flag == 0) {
uint64_t v_size = ffio_read_varlen(pb); uint64_t v_size = ffio_read_varlen(pb);
int last = 0, last_start;
if (!viv->num_audio) if (!viv->num_audio)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -707,12 +708,18 @@ static int viv_read_packet(AVFormatContext *s, ...@@ -707,12 +708,18 @@ static int viv_read_packet(AVFormatContext *s,
if (i > 0 && start == 0) if (i > 0 && start == 0)
break; break;
if (start < last)
return AVERROR_INVALIDDATA;
viv->n_audio_subpackets = i + 1; viv->n_audio_subpackets = i + 1;
last =
viv->audio_subpackets[i].start = start; viv->audio_subpackets[i].start = start;
viv->audio_subpackets[i].pcm_bytes = pcm_bytes; viv->audio_subpackets[i].pcm_bytes = pcm_bytes;
} }
last_start =
viv->audio_subpackets[viv->n_audio_subpackets].start = (int)(off - avio_tell(pb)); 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; viv->current_audio_subpacket = 0;
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment