[FFmpeg-cvslog] avcodec/qtrle: Check side data size before use
Michael Niedermayer
git at videolan.org
Sat Nov 26 16:47:55 EET 2016
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 30 15:12:12 2016 +0100| [1604a2b1e6c45ac6f905a2c945de483444d48226] | committer: Michael Niedermayer
avcodec/qtrle: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 7d196f2a5a48faf25fd904b33b1fd239daae9840)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1604a2b1e6c45ac6f905a2c945de483444d48226
---
libavcodec/qtrle.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 1fcf5b3..a2f8903 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 */
More information about the ffmpeg-cvslog
mailing list