Commit 979bca51 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tscc: Check side data size before use

Fixes out of array read
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent e1676107
...@@ -98,11 +98,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -98,11 +98,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
/* make the palette available on the way out */ /* make the palette available on the way out */
if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
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) {
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
memcpy(c->pal, pal, AVPALETTE_SIZE); memcpy(c->pal, pal, AVPALETTE_SIZE);
} else if (pal) {
av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
} }
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); memcpy(frame->data[1], c->pal, AVPALETTE_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