aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2013-12-12 03:34:19 -0300
committerMichael Niedermayer <michaelni@gmx.at>2013-12-12 17:26:19 +0100
commitc619e14c314b44d86a8d552259afb957c0b6775d (patch)
tree79dc3c1fdad416fab66ff3429d5d19292d4ec424
parent30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb (diff)
downloadffmpeg-c619e14c314b44d86a8d552259afb957c0b6775d.tar.gz
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 <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/oggparseopus.c6
1 files changed, 5 insertions, 1 deletions
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;