RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/interplayvideo: Clean up frames on parameter change 

Fixes: out of array access
Fixes: 2467/clusterfuzz-testcase-minimized-4755798049685504

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-07-06 03:46:44 +02:00
parent 121ab69c9d
commit f1baafac71
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/interplayvideo.c
View File

@ -1214,6 +1214,20 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
if (av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, NULL)) {
av_frame_unref(s->last_frame);
av_frame_unref(s->second_last_frame);
av_frame_unref(s->cur_decode_frame);
av_frame_unref(s->prev_decode_frame);
}
if (!s->cur_decode_frame->data[0]) {
ret = ff_get_buffer(avctx, s->cur_decode_frame, 0);
if (ret < 0)
return ret;
ret = ff_get_buffer(avctx, s->prev_decode_frame, 0);
if (ret < 0) {
av_frame_unref(s->cur_decode_frame);
return ret;
}
}
if (buf_size < 8)