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

avformat/oggparseopus: Check opus_duration() return value

Browse Source 
Regression since 39d11d599cd292485fe991cd22e10d7a1738b3bc

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2013-12-12 03:34:19 -03:00 committed by Michael Niedermayer
parent 30ee4b3393
commit c619e14c31
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/oggparseopus.c
View File

@ -109,6 +109,7 @@ static int opus_packet(AVFormatContext *avf, int idx)
AVStream *st = avf->streams[idx]; AVStream *st = avf->streams[idx];
struct oggopus_private *priv = os->private; struct oggopus_private *priv = os->private;
uint8_t *packet = os->buf + os->pstart; uint8_t *packet = os->buf + os->pstart;
int ret;
if (!os->psize) if (!os->psize)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -144,7 +145,10 @@ static int opus_packet(AVFormatContext *avf, int idx)
os->lastdts = os->granule - duration; os->lastdts = os->granule - duration;
} }
os->pduration = opus_duration(packet, os->psize); if ((ret = opus_duration(packet, os->psize)) < 0)
return ret;
os->pduration = ret;
if (os->lastpts != AV_NOPTS_VALUE) { if (os->lastpts != AV_NOPTS_VALUE) {
if (st->start_time == AV_NOPTS_VALUE) if (st->start_time == AV_NOPTS_VALUE)
st->start_time = os->lastpts; st->start_time = os->lastpts;