aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-30 15:12:12 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-10-31 00:19:02 +0100
commita6330119a099840c5279697cf80cb768df97a90a (patch)
tree9abdf5ee0a97dcd332f6b4af064590a6a856d42f /libavcodec
parent21b68cdbae6576bb58c19dd44c0669293f7d05d1 (diff)
downloadffmpeg-a6330119a099840c5279697cf80cb768df97a90a.tar.gz
avcodec/msrle: Check side data size before use
Fixes out of array read Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/msrle.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index c2f624283d..adb55b1302 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -99,11 +99,14 @@ static int msrle_decode_frame(AVCodecContext *avctx,
return ret;
if (avctx->bits_per_coded_sample > 1 && avctx->bits_per_coded_sample <= 8) {
- 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 */
memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);