Commit 121be310 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/cinepak: Check side data size before use

Fixes out of array read
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 042faa84
...@@ -443,10 +443,13 @@ static int cinepak_decode_frame(AVCodecContext *avctx, ...@@ -443,10 +443,13 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
return ret; return ret;
if (s->palette_video) { if (s->palette_video) {
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); int size;
if (pal) { const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
if (pal && size == AVPALETTE_SIZE) {
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE); memcpy(s->pal, pal, AVPALETTE_SIZE);
} else if (pal) {
av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment