diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 13:44:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:16 +0200 |
| commit | 53f8e8388ee3382a43e306a177a0124a8fcd7efc (patch) | |
| tree | 3cc78057cdbe349841feb61fc3df822e082d060b | |
| parent | acd2c3842c7f79d4b6561b095f377968f4772d6d (diff) | |
| download | ffmpeg-53f8e8388ee3382a43e306a177a0124a8fcd7efc.tar.gz | |
avcodec/8bps: Check side data size before use
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 042faa847feea820451c474af0034fd3de9cff82)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/8bps.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index e00bdfc808..960b15fc0b 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -120,12 +120,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, } if (avctx->bits_per_coded_sample <= 8) { + int size; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, - NULL); - if (pal) { + &size); + if (pal && size == AVPALETTE_SIZE) { frame->palette_has_changed = 1; memcpy(c->pal, pal, AVPALETTE_SIZE); + } else if (pal) { + av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size); } memcpy (frame->data[1], c->pal, AVPALETTE_SIZE); |