diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 15:12:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-31 01:08:45 +0100 |
| commit | 161ccdaa06d1d109e8f77d2535bda11ce02720f5 (patch) | |
| tree | 796c500c0dea0366a518eb744b6d787b6f8949fa /libavcodec/msvideo1.c | |
| parent | 16793504dfba44e738655807db3274301b9bc690 (diff) | |
avcodec/msvideo1: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/msvideo1.c')
| -rw-r--r-- | libavcodec/msvideo1.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 1d141723f6..a49b9be364 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -305,11 +305,14 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, return ret; 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); s->frame->palette_has_changed = 1; + } else if (pal) { + av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size); } } |