diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 15:12:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 15:38:44 +0100 |
| commit | 2d99101d0964f754822fb4af121c4abc69047dba (patch) | |
| tree | eecd62f1cca76b4c2ec0eb6debf7573d5ca3f8de /libavcodec/kmvc.c | |
| parent | a2b8dde65947bfabf42269e124ef83ecf9c5974a (diff) | |
| download | ffmpeg-streaming-2d99101d0964f754822fb4af121c4abc69047dba.zip ffmpeg-streaming-2d99101d0964f754822fb4af121c4abc69047dba.tar.gz | |
avcodec/kmvc: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/kmvc.c')
| -rw-r--r-- | libavcodec/kmvc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index 7acaba7..ffe6a14 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -268,7 +268,8 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, int i, ret; int header; int blocksize; - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); + int pal_size; + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size); bytestream2_init(&ctx->g, avpkt->data, avpkt->size); @@ -303,9 +304,11 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, } } - if (pal) { + if (pal && pal_size == AVPALETTE_SIZE) { frame->palette_has_changed = 1; memcpy(ctx->pal, pal, AVPALETTE_SIZE); + } else if (pal) { + av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size); } if (ctx->setpal) { |
