diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 13:44:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-04 20:25:15 +0100 |
| commit | 35498718474f287eb6fa209b4f72756ecc66c32c (patch) | |
| tree | d0126aaf060d5cbe182208f457d513bfe5f906ad | |
| parent | 9ec40eacb1696933b507bf6860d149f0c25494b6 (diff) | |
| download | ffmpeg-35498718474f287eb6fa209b4f72756ecc66c32c.tar.gz | |
avcodec/8bps: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 042faa847feea820451c474af0034fd3de9cff82)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/8bps.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 2e4464dbb4..14f7bd5bf6 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -120,12 +120,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); |