diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-17 21:27:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 15:38:20 +0100 |
| commit | 84bc2cea237725de468f53dbba6d53140fae21c5 (patch) | |
| tree | 034fe5af7268b9b37f0e20c2adfbe7488ca308fd | |
| parent | 9dc6a7f13a23110c04568e890ef340f014c23303 (diff) | |
| download | ffmpeg-84bc2cea237725de468f53dbba6d53140fae21c5.tar.gz | |
avcodec/h264: Clear delayed_pic on deallocation
Fixes use of freed memory
Fixes: case5_av_frame_copy_props.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e8714f6f93d1a32f4e4655209960afcf4c185214)
Conflicts:
libavcodec/h264.c
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7ea833fa83..1194fd9da9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1231,6 +1231,7 @@ static void free_tables(H264Context *h, int free_rbsp) av_buffer_pool_uninit(&h->ref_index_pool); if (free_rbsp && h->DPB) { + memset(h->delayed_pic, 0, sizeof(h->delayed_pic)); for (i = 0; i < MAX_PICTURE_COUNT; i++) unref_picture(h, &h->DPB[i]); av_freep(&h->DPB); |