diff options
| author | Michael Niedermayer <[email protected]> | 2017-04-01 19:18:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2017-05-14 12:20:15 +0200 |
| commit | 5e8786fc228f877157c17d3df326fc80674cdfa1 (patch) | |
| tree | 6881eb6e09851d5779e54251005a5a00e3dd2703 | |
| parent | a17d258e949e27086413db9da2ea01923de32990 (diff) | |
avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE
This avoids an integer overflow
the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500
Fixes: 700242
Found-by: Thomas Guilbert <[email protected]>
Reviewed-by: Rostislav Pehlivanov <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 679a315424e6ffaafd21ebf7a86108bd4e743793)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/oggparsedaala.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |