Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'

[ffmpeg] / libavformat / oggparsedaala.c

diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c
index 24567f93a9b4aaa414ee1419077d33b18207e76e..3651ca188bd88700b3005f35cee94b4eb6f6550a 100644 (file)
--- a/libavformat/oggparsedaala.c
+++ b/libavformat/oggparsedaala.c
@@ -123,7 +123,12 @@ static int daala_header(AVFormatContext *s, int idx)
 
         hdr->frame_duration = bytestream2_get_ne32(&gb);
         hdr->gpshift = bytestream2_get_byte(&gb);
-        hdr->gpmask  = (1 << hdr->gpshift) - 1;
+        if (hdr->gpshift >= 32) {
+            av_log(s, AV_LOG_ERROR, "Too large gpshift %d (>= 32).\n",
+                   hdr->gpshift);
+            return AVERROR_INVALIDDATA;
+        }
+        hdr->gpmask  = (1U << hdr->gpshift) - 1;
 
         hdr->format.depth  = 8 + 2*(bytestream2_get_byte(&gb)-1);