ffmpeg | branch: release/3.0 | Michael Niedermayer <mich...@niedermayer.cc> | Sun Oct 30 15:12:12 2016 +0100| [8fd3293fa14866da1240d880b725ea171834eebc] | committer: Michael Niedermayer
avcodec/rawdec: Check side data size before use Fixes out of array read Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 5f0bc0215a0f7099a2bcba5dced2e045e70fee61) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fd3293fa14866da1240d880b725ea171834eebc --- libavcodec/rawdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 193a88f..f78190e 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -383,8 +383,13 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, } if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { + int pal_size; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, - NULL); + &pal_size); + if (pal_size != AVPALETTE_SIZE) { + av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size); + pal = NULL; + } if (pal) { av_buffer_unref(&context->palette); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
