diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-03 13:34:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | 2a8441e949ee2eb83e78673b5fd877045c9b53be (patch) | |
| tree | 56abdc3d21b0eefb71107553a7e9ab7c80014968 | |
| parent | 7876fd679d98531a2b3c864d40eafd42de938d3f (diff) | |
| download | android_external_ffmpeg-2a8441e949ee2eb83e78673b5fd877045c9b53be.tar.gz android_external_ffmpeg-2a8441e949ee2eb83e78673b5fd877045c9b53be.tar.bz2 android_external_ffmpeg-2a8441e949ee2eb83e78673b5fd877045c9b53be.zip | |
avformat/oggdec: Fix integer overflow with invalid pts
If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c5cc3b08e56fc95665977544486bd9f06e4b7a72)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/oggdec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index d7af1cfabd..4a2b6ddee8 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -162,6 +162,11 @@ ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts) if (dts) *dts = pts; } + if (pts > INT64_MAX && pts != AV_NOPTS_VALUE) { + // The return type is unsigned, we thus cannot return negative pts + av_log(s, AV_LOG_ERROR, "invalid pts %"PRId64"\n", pts); + pts = AV_NOPTS_VALUE; + } return pts; } |