diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 0f5be96eb7..32f808beb4 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -156,8 +156,11 @@ static int allocate_buffers(ShortenContext *s)
 
 static inline unsigned int get_uint(ShortenContext *s, int k)
 {
-    if (s->version != 0)
+    if (s->version != 0) {
         k = get_ur_golomb_shorten(&s->gb, ULONGSIZE);
+        if (k > 31U)
+            return AVERROR_INVALIDDATA;
+    }
     return get_ur_golomb_shorten(&s->gb, k);
 }