diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-30 13:44:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-17 12:47:40 +0100 |
| commit | c9c619e667e1ae0353c8210847e937ff84eb2e3d (patch) | |
| tree | 45faba242835c979c39669613f1450eae6433398 | |
| parent | 48ee545d11e67c02242638623204988a69444537 (diff) | |
| download | ffmpeg-c9c619e667e1ae0353c8210847e937ff84eb2e3d.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 49fd445494..aa2318fa2d 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -122,12 +122,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); |