highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/rsd: Check size and start before computing duration

Browse Source 
Fixes: signed integer overflow: 100794754 * 28 cannot be represented in type 'int'
Fixes: 26474/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-5181797606096896

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:
Michael Niedermayer
2020-10-21 18:15:53 +02:00
parent b848baef0d
commit c79d8a6851
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/rsd.c
View File

@@ -103,13 +103,9 @@ static int rsd_read_header(AVFormatContext *s)
break; break;
case AV_CODEC_ID_ADPCM_PSX: case AV_CODEC_ID_ADPCM_PSX:
par->block_align = 16 * par->channels; par->block_align = 16 * par->channels;
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start);
break; break;
case AV_CODEC_ID_ADPCM_IMA_RAD: case AV_CODEC_ID_ADPCM_IMA_RAD:
par->block_align = 20 * par->channels; par->block_align = 20 * par->channels;
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start);
break; break;
case AV_CODEC_ID_ADPCM_IMA_WAV: case AV_CODEC_ID_ADPCM_IMA_WAV:
if (version == 2) if (version == 2)
@@ -117,8 +113,6 @@ static int rsd_read_header(AVFormatContext *s)
par->bits_per_coded_sample = 4; par->bits_per_coded_sample = 4;
par->block_align = 36 * par->channels; par->block_align = 36 * par->channels;
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start);
break; break;
case AV_CODEC_ID_ADPCM_THP_LE: case AV_CODEC_ID_ADPCM_THP_LE:
/* RSD3GADP is mono, so only alloc enough memory /* RSD3GADP is mono, so only alloc enough memory
@@ -128,8 +122,6 @@ static int rsd_read_header(AVFormatContext *s)
if ((ret = ff_get_extradata(s, par, s->pb, 32)) < 0) if ((ret = ff_get_extradata(s, par, s->pb, 32)) < 0)
return ret; return ret;
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start);
break; break;
case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP:
par->block_align = 8 * par->channels; par->block_align = 8 * par->channels;
@@ -142,18 +134,36 @@ static int rsd_read_header(AVFormatContext *s)
avio_read(s->pb, st->codecpar->extradata + 32 * i, 32); avio_read(s->pb, st->codecpar->extradata + 32 * i, 32);
avio_skip(s->pb, 8); avio_skip(s->pb, 8);
} }
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = (avio_size(pb) - start) / (8 * par->channels) * 14;
break; break;
case AV_CODEC_ID_PCM_S16LE: case AV_CODEC_ID_PCM_S16LE:
case AV_CODEC_ID_PCM_S16BE: case AV_CODEC_ID_PCM_S16BE:
if (version != 4) if (version != 4)
start = avio_rl32(pb); start = avio_rl32(pb);
if (pb->seekable & AVIO_SEEKABLE_NORMAL)
st->duration = (avio_size(pb) - start) / 2 / par->channels;
break; break;
} }
if (start < 0)
return AVERROR_INVALIDDATA;
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
int64_t remaining = avio_size(pb);
if (remaining >= start && remaining - start <= INT_MAX)
switch (par->codec_id) {
case AV_CODEC_ID_ADPCM_PSX:
case AV_CODEC_ID_ADPCM_IMA_RAD:
case AV_CODEC_ID_ADPCM_IMA_WAV:
case AV_CODEC_ID_ADPCM_THP_LE:
st->duration = av_get_audio_frame_duration2(par, remaining - start);
break;
case AV_CODEC_ID_ADPCM_THP:
st->duration = (remaining - start) / (8 * par->channels) * 14;
break;
case AV_CODEC_ID_PCM_S16LE:
case AV_CODEC_ID_PCM_S16BE:
st->duration = (remaining - start) / 2 / par->channels;
}
}
avio_skip(pb, start - avio_tell(pb)); avio_skip(pb, start - avio_tell(pb));
if (par->codec_id == AV_CODEC_ID_XMA2) { if (par->codec_id == AV_CODEC_ID_XMA2) {