avcodec/magicyuv: Check len to be supported
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 7 May 2017 12:53:31 +0000 (14:53 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 7 May 2017 13:31:00 +0000 (15:31 +0200)
Fixes: shift exponent -1 is negative
Fixes: 1390/clusterfuzz-testcase-minimized-5452757630713856

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/magicyuv.c

index 6250536..5f09c0b 100644 (file)
@@ -97,6 +97,8 @@ static int huff_build10(VLC *vlc, uint8_t *len)
     for (i = 0; i < 1024; i++) {
         he[i].sym = 1023 - i;
         he[i].len = len[i];
+        if (len[i] == 0)
+            return AVERROR_INVALIDDATA;
     }
     AV_QSORT(he, 1024, HuffEntry, huff_cmp_len10);
 
@@ -127,6 +129,8 @@ static int huff_build(VLC *vlc, uint8_t *len)
     for (i = 0; i < 256; i++) {
         he[i].sym = 255 - i;
         he[i].len = len[i];
+        if (len[i] == 0)
+            return AVERROR_INVALIDDATA;
     }
     AV_QSORT(he, 256, HuffEntry, huff_cmp_len);