Commit c619e14c authored by James Almer's avatar James Almer Committed by Michael Niedermayer

avformat/oggparseopus: Check opus_duration() return value

Regression since 39d11d59

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 30ee4b33
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment