From 1a82d2cf8fb6a7e854e7548dfcf73c3d046b34ac Mon Sep 17 00:00:00 2001 From: Thomas Guilbert Date: Fri, 27 May 2016 15:50:25 -0700 Subject: avformat/oggparseopus: Fix Undefined behavior in oggparseopus.c and libavformat/utils.c Fixes: usan_granule_overflow constant type fix by commiter Signed-off-by: Michael Niedermayer --- libavformat/oggparseopus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/oggparseopus.c') diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 99aa4398dd..f45ad84874 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -117,7 +117,7 @@ static int opus_packet(AVFormatContext *avf, int idx) if (!os->psize) return AVERROR_INVALIDDATA; - if (os->granule > INT64_MAX - UINT32_MAX) { + if (os->granule > (1LL << 62)) { av_log(avf, AV_LOG_ERROR, "Unsupported huge granule pos %"PRId64 "\n", os->granule); return AVERROR_INVALIDDATA; } -- cgit v1.2.3