har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-26 16:17:55 +01:00
commit 386fc67c79
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/utils.c
View File

@ -826,7 +826,10 @@ void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st,
*pnum = st->codec->time_base.num; *pnum = st->codec->time_base.num;
*pden = st->codec->time_base.den; *pden = st->codec->time_base.den;
if (pc && pc->repeat_pict) { if (pc && pc->repeat_pict) {
*pnum = (*pnum) * (1 + pc->repeat_pict); if (*pnum > INT_MAX / (1 + pc->repeat_pict))
*pden /= 1 + pc->repeat_pict;
else
*pnum *= 1 + pc->repeat_pict;
} }
//If this codec can be interlaced or progressive then we need a parser to compute duration of a packet //If this codec can be interlaced or progressive then we need a parser to compute duration of a packet
//Thus if we have no parser in such case leave duration undefined. //Thus if we have no parser in such case leave duration undefined.