[FFmpeg-devel] [PATCH 1/3] avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE

[Michael Niedermayer]

On Sat, Apr 01, 2017 at 09:05:10PM +0100, Rostislav Pehlivanov wrote:
> On 1 April 2017 at 18:18, Michael Niedermayer <michael at niedermayer.cc>
> wrote:
> 
> > This avoids an integer overflow
> > the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c16
> > 75da68f500
> >
> > Fixes: 700242
> >
> > Found-by: Thomas Guilbert <tguilbert at google.com>
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/oggparsedaala.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c
> > index 89bda58994..ce65b2bd7a 100644
> > --- a/libavformat/oggparsedaala.c
> > +++ b/libavformat/oggparsedaala.c
> > @@ -232,7 +232,7 @@ static int daala_packet(AVFormatContext *s, int idx)
> >          os->lastpts = os->lastdts = daala_gptopts(s, idx, os->granule,
> > NULL) - duration;
> >          if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
> >              s->streams[idx]->start_time = os->lastpts;
> > -            if (s->streams[idx]->duration)
> > +            if (s->streams[idx]->duration != AV_NOPTS_VALUE)
> >                  s->streams[idx]->duration -= s->streams[idx]->start_time;
> >          }
> >      }
> > --
> > 2.11.0
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> LGTM, thanks

applied

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170401/f03cb794/attachment.sig>