Browse Source

avformat/oggparseopus: Check opus_duration() return value

Regression since 39d11d599c

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>
tags/n2.2-rc1
James Almer Michael Niedermayer 11 years ago
parent
commit
c619e14c31
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavformat/oggparseopus.c

+ 5
- 1
libavformat/oggparseopus.c View File

@@ -109,6 +109,7 @@ static int opus_packet(AVFormatContext *avf, int idx)
AVStream *st = avf->streams[idx];
struct oggopus_private *priv = os->private;
uint8_t *packet = os->buf + os->pstart;
int ret;

if (!os->psize)
return AVERROR_INVALIDDATA;
@@ -144,7 +145,10 @@ static int opus_packet(AVFormatContext *avf, int idx)
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 (st->start_time == AV_NOPTS_VALUE)
st->start_time = os->lastpts;


Loading…
Cancel
Save