OSDN Git Service

avcodec/interplayvideo: Check side data size before use
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 25 Oct 2016 01:51:17 +0000 (03:51 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 25 Oct 2016 02:46:02 +0000 (04:46 +0200)
Fixes out of array read

Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/interplayvideo.c

index aa03015..abfc935 100644 (file)
@@ -1013,10 +1013,13 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
         return ret;
 
     if (!s->is_16bpp) {
-        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
-        if (pal) {
+        int size;
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
+        if (pal && size == AVPALETTE_SIZE) {
             frame->palette_has_changed = 1;
             memcpy(s->pal, pal, AVPALETTE_SIZE);
+        } else if (pal) {
+            av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
         }
     }