avcodec/msvideo1: Check side data size before use
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 17 Nov 2016 11:47:40 +0000 (12:47 +0100)
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 161ccdaa06d1d109e8f77d2535bda11ce02720f5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/msvideo1.c

index 1d14172..a49b9be 100644 (file)
@@ -305,11 +305,14 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
         return ret;
 
     if (s->mode_8bit) {
-        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+        int size;
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
 
-        if (pal) {
+        if (pal && size == AVPALETTE_SIZE) {
             memcpy(s->pal, pal, AVPALETTE_SIZE);
             s->frame->palette_has_changed = 1;
+        } else if (pal) {
+            av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
         }
     }