| Message ID | 20180308191327.22228-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 02ecda4aba69670ca744ccc640391b7621f01fb0 |
| Headers | show |
On Thu, Mar 08, 2018 at 08:13:26PM +0100, Michael Niedermayer wrote: > Fixes: Chromium bug 795653 > Fixes: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long' > Reported-by: Matt Wolenetz <wolenetz@google.com> > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/oggparsetheora.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) patchset applied [...]
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index b14f9f0669..b0c0edc7a5 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -181,6 +181,7 @@ static int theora_packet(AVFormatContext *s, int idx) if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) { int seg; + int64_t pts; duration = 1; for (seg = os->segp; seg < os->nsegs; seg++) { @@ -188,7 +189,10 @@ static int theora_packet(AVFormatContext *s, int idx) duration ++; } - os->lastpts = os->lastdts = theora_gptopts(s, idx, os->granule, NULL) - duration; + pts = theora_gptopts(s, idx, os->granule, NULL); + if (pts != AV_NOPTS_VALUE) + pts -= duration; + os->lastpts = os->lastdts = pts; if(s->streams[idx]->start_time == AV_NOPTS_VALUE) { s->streams[idx]->start_time = os->lastpts; if (s->streams[idx]->duration > 0)
Fixes: Chromium bug 795653 Fixes: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long' Reported-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/oggparsetheora.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)