diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 13:47:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 14:15:00 +0100 |
| commit | 121be310607879841d19a34d9f16d4fe9ba7f18c (patch) | |
| tree | 222238490b773b37c1d91776d19dbb096848c50a /libavcodec | |
| parent | 042faa847feea820451c474af0034fd3de9cff82 (diff) | |
| download | ffmpeg-121be310607879841d19a34d9f16d4fe9ba7f18c.tar.gz | |
avcodec/cinepak: 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/cinepak.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index a2190d7598..737462bd9c 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -443,10 +443,13 @@ static int cinepak_decode_frame(AVCodecContext *avctx, return ret; if (s->palette_video) { - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); - if (pal) { + int size; + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size); + 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); } } |