diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 15:12:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-31 23:20:47 +0100 |
| commit | 140f48b90fbe32a88423aad473bccc72c3bb450e (patch) | |
| tree | 0e3b1bf7d4d123d119ebbaa809785dbe4462229c /libavcodec/smc.c | |
| parent | 979bca513424879ed0c653cb1b55fc4156a89576 (diff) | |
| download | ffmpeg-140f48b90fbe32a88423aad473bccc72c3bb450e.tar.gz | |
avcodec/smc: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/smc.c')
| -rw-r--r-- | libavcodec/smc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 69d78ad1d1..89524219f8 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -431,7 +431,8 @@ static int smc_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; SmcContext *s = avctx->priv_data; - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); + int pal_size; + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size); int ret; bytestream2_init(&s->gb, buf, buf_size); @@ -439,9 +440,11 @@ static int smc_decode_frame(AVCodecContext *avctx, if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; - if (pal) { + if (pal && pal_size == AVPALETTE_SIZE) { s->frame->palette_has_changed = 1; memcpy(s->pal, pal, AVPALETTE_SIZE); + } else if (pal) { + av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size); } smc_decode_stream(s); |