diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 15:12:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-26 15:12:26 +0100 |
| commit | 1604a2b1e6c45ac6f905a2c945de483444d48226 (patch) | |
| tree | add028214765335ffa6c2c2f374f1c64fe3411f5 | |
| parent | f39522b6e75deab0285510f87b4868da69063d10 (diff) | |
| download | ffmpeg-1604a2b1e6c45ac6f905a2c945de483444d48226.tar.gz | |
avcodec/qtrle: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7d196f2a5a48faf25fd904b33b1fd239daae9840)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qtrle.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 1fcf5b3c79..a2f89039a8 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -485,11 +485,14 @@ static int qtrle_decode_frame(AVCodecContext *avctx, } if(has_palette) { - 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) { 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", size); } /* make the palette available on the way out */ |