diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 21:09:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 00:49:11 +0100 |
| commit | b9058f58bde97af4178c8cffa1bbdc85787de2ab (patch) | |
| tree | 1690b2c6eb28781489854b73349f9cb3c8ee2b4c /libavcodec | |
| parent | 47faf347a0ed7c8a28232fa07ad0a53edccad7ac (diff) | |
| download | ffmpeg-b9058f58bde97af4178c8cffa1bbdc85787de2ab.tar.gz | |
h264_refs: Check for attempts to assign pictures to short & long.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 92002db3eb437414281ad4fb6e84e34862f7fc92)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_refs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 01f79f6a33..2ba36b632c 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -586,6 +586,9 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) { remove_long(h, mmco[i].long_arg, 0); + if (remove_short(h, h->cur_pic_ptr->frame_num, 0)) { + av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to short and long at the same time\n"); + } h->long_ref[ mmco[i].long_arg ]= h->cur_pic_ptr; h->long_ref[ mmco[i].long_arg ]->long_ref=1; |