summaryrefslogtreecommitdiff
path: root/libavformat/oggdec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-08-03 13:34:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-03 16:09:03 +0200
commitc5cc3b08e56fc95665977544486bd9f06e4b7a72 (patch)
tree524ffc2c0895daaf0cadba91302458b45bebcf78 /libavformat/oggdec.h
parent6cd9a8b67a95a136ea15bfe3c3bab6cf5e6d1cc9 (diff)
downloadffmpeg-c5cc3b08e56fc95665977544486bd9f06e4b7a72.tar.gz
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>
Diffstat (limited to 'libavformat/oggdec.h')
-rw-r--r--libavformat/oggdec.h5
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;
}