virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

dcstr: fix division by zero

Browse Source 
Also check for possible overflows.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-10-20 20:13:54 +02:00
parent 93c39db5f1
commit b0a043f51b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/dcstr.c
View File

@ -33,6 +33,7 @@ static int dcstr_probe(AVProbeData *p)
static int dcstr_read_header(AVFormatContext *s) static int dcstr_read_header(AVFormatContext *s)
{ {
unsigned codec, align; unsigned codec, align;
int mult;
AVStream *st; AVStream *st;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
@ -46,7 +47,12 @@ static int dcstr_read_header(AVFormatContext *s)
align = avio_rl32(s->pb); align = avio_rl32(s->pb);
avio_skip(s->pb, 4); avio_skip(s->pb, 4);
st->duration = avio_rl32(s->pb); st->duration = avio_rl32(s->pb);
st->codecpar->channels *= avio_rl32(s->pb); mult = avio_rl32(s->pb);
if (st->codecpar->channels <= 0 || mult <= 0 || mult > INT_MAX / st->codecpar->channels) {
av_log(s, AV_LOG_ERROR, "invalid number of channels %d x %d\n", st->codecpar->channels, mult);
return AVERROR_INVALIDDATA;
}
st->codecpar->channels *= mult;
if (!align || align > INT_MAX / st->codecpar->channels) if (!align || align > INT_MAX / st->codecpar->channels)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
st->codecpar->block_align = align * st->codecpar->channels; st->codecpar->block_align = align * st->codecpar->channels;