Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'

[ffmpeg] / libavcodec / msrle.c

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index a1ef037e49b29894fd0b42c012456bc9643ae7a2..5b7ba7fdad4b30bce2c1afcacf9d643ae997cbd2 100644 (file)
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -73,8 +73,8 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
     avcodec_get_frame_defaults(&s->frame);
     s->frame.data[0] = NULL;
 
-    if (avctx->extradata_size >= AVPALETTE_SIZE)
-        for (i = 0; i < AVPALETTE_SIZE/4; i++)
+    if (avctx->extradata_size >= 4)
+        for (i = 0; i < FFMIN(avctx->extradata_size, AVPALETTE_SIZE)/4; i++)
             s->pal[i] = 0xFFU<<24 | AV_RL32(avctx->extradata+4*i);
 
     return 0;