From c619e14c314b44d86a8d552259afb957c0b6775d Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 12 Dec 2013 03:34:19 -0300 Subject: [PATCH] avformat/oggparseopus: Check opus_duration() return value Regression since 39d11d599cd292485fe991cd22e10d7a1738b3bc os->pduration would be wrongly assigned a negative value on invalid packets instead of aborting. Signed-off-by: James Almer Signed-off-by: Michael Niedermayer --- libavformat/oggparseopus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index edcb7b4529..aafefbbe65 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -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;