Permalink
Browse files

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>
  • Loading branch information...
1 parent c117343 commit 85d23e5cbc9ad6835eef870a5b4247de78febe56 Michael Niedermayer committed Oct 25, 2016
Showing with 5 additions and 2 deletions.
  1. +5 −2 libavcodec/interplayvideo.c
@@ -1013,10 +1013,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);
}
}

0 comments on commit 85d23e5

Please sign in to comment.