mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/electronicarts: More chunk_size checks
Fixes: Timeout Fixes: 26909/clusterfuzz-testcase-minimized-ffmpeg_dem_EA_fuzzer-6489496553783296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
386faeda5f
commit
d03f0ec9a1
|
@ -607,10 +607,14 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
break;
|
break;
|
||||||
} else if (ea->audio_codec == AV_CODEC_ID_PCM_S16LE_PLANAR ||
|
} else if (ea->audio_codec == AV_CODEC_ID_PCM_S16LE_PLANAR ||
|
||||||
ea->audio_codec == AV_CODEC_ID_MP3) {
|
ea->audio_codec == AV_CODEC_ID_MP3) {
|
||||||
|
if (chunk_size < 12)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
num_samples = avio_rl32(pb);
|
num_samples = avio_rl32(pb);
|
||||||
avio_skip(pb, 8);
|
avio_skip(pb, 8);
|
||||||
chunk_size -= 12;
|
chunk_size -= 12;
|
||||||
} else if (ea->audio_codec == AV_CODEC_ID_ADPCM_PSX) {
|
} else if (ea->audio_codec == AV_CODEC_ID_ADPCM_PSX) {
|
||||||
|
if (chunk_size < 8)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
avio_skip(pb, 8);
|
avio_skip(pb, 8);
|
||||||
chunk_size -= 8;
|
chunk_size -= 8;
|
||||||
}
|
}
|
||||||
|
@ -693,6 +697,8 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
case fVGT_TAG:
|
case fVGT_TAG:
|
||||||
case MADm_TAG:
|
case MADm_TAG:
|
||||||
case MADe_TAG:
|
case MADe_TAG:
|
||||||
|
if (chunk_size > INT_MAX - 8)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
|
avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
|
||||||
chunk_size += 8;
|
chunk_size += 8;
|
||||||
goto get_video_packet;
|
goto get_video_packet;
|
||||||
|
|
Loading…
Reference in New Issue