Browse Source

avcodec/8bps: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Michael Niedermayer 9 years ago
parent
commit
042faa847f
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/8bps.c

+ 5
- 2
libavcodec/8bps.c View File

@@ -122,12 +122,15 @@ static int decode_frame(AVCodecContext *avctx, void *data,
}

if (avctx->bits_per_coded_sample <= 8) {
int size;
const uint8_t *pal = av_packet_get_side_data(avpkt,
AV_PKT_DATA_PALETTE,
NULL);
if (pal) {
&size);
if (pal && size == AVPALETTE_SIZE) {
frame->palette_has_changed = 1;
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);


Loading…
Cancel
Save