diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 13:47:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-26 15:12:26 +0100 |
| commit | 41b1ec0810197633bd55aa5ab9cd9885443cb0ad (patch) | |
| tree | 331cd4f0a8037e29d582e48f5d75c627c614df28 | |
| parent | e3f8b322793d54b168cf51f59ff0ec76160e6f77 (diff) | |
| download | ffmpeg-41b1ec0810197633bd55aa5ab9cd9885443cb0ad.tar.gz | |
avcodec/cinepak: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 121be310607879841d19a34d9f16d4fe9ba7f18c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -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 f1a4656303..58c26dc69c 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); } } |