diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-25 03:51:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-05 18:29:12 +0100 |
| commit | 0e3dc45ce81f9c9db5a6a6e2df96670164e82dec (patch) | |
| tree | 6bebb10a2c5f2e489e9920cfe90351e3b36df646 /libavcodec/interplayvideo.c | |
| parent | 072246993acb9ce22f88e3df697f78dba61fcdd3 (diff) | |
| download | ffmpeg-0e3dc45ce81f9c9db5a6a6e2df96670164e82dec.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/interplayvideo.c')
| -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 88c610d651..899f52cb3c 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); } } |