ffmpeg | branch: release/2.1 | James Almer <jamr...@gmail.com> | Thu Dec 12 03:34:19 2013 -0300| [fc82ba06ee87e16b65ba1a426641e3484a69da71] | committer: James Almer
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 <jamr...@gmail.com> Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit c619e14c314b44d86a8d552259afb957c0b6775d) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc82ba06ee87e16b65ba1a426641e3484a69da71 --- libavformat/oggparseopus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 6e6adcd..86aaaf5 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -108,6 +108,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; @@ -143,7 +144,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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog