mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/msvideo1: Check side data size before use
Fixes out of array read Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
16793504df
commit
161ccdaa06
|
@ -305,11 +305,14 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (s->mode_8bit) {
|
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);
|
memcpy(s->pal, pal, AVPALETTE_SIZE);
|
||||||
s->frame->palette_has_changed = 1;
|
s->frame->palette_has_changed = 1;
|
||||||
|
} else if (pal) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue