diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-25 03:51:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-26 15:12:26 +0100 |
| commit | abe16359ba805037da0866ce07c962a57f71bcf1 (patch) | |
| tree | 5ca015b361bb9800837150b3e2b4084b8cf63b73 /libavcodec | |
| parent | b9ab4db9f935a00611bad89b7c0330283c2468e4 (diff) | |
| download | ffmpeg-abe16359ba805037da0866ce07c962a57f71bcf1.tar.gz | |
avcodec/interplayvideo: Check side data size before use
Fixes out of array read
Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 85d23e5cbc9ad6835eef870a5b4247de78febe56)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/interplayvideo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 1460741a53..3c3212e1fe 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1012,10 +1012,13 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, return ret; if (!s->is_16bpp) { - 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) { 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); } } |