diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 17:12:12 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-26 17:12:26 +0300 |
| commit | 147a387fba2edb5ecd418656c4a37c36b0a202ab (patch) | |
| tree | 035f1dce33511a65378f11e5407f14e25e0bd16e /libavcodec/msvideo1.c | |
| parent | 2312d1d97965f6c95292d787c07d12b7fe4c44e0 (diff) | |
avcodec/msvideo1: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 161ccdaa06d1d109e8f77d2535bda11ce02720f5)
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 891675fcb0..0526505a96 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -306,11 +306,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); } } |