[FFmpeg-cvslog] h264_refs: Check for attempts to assign pictures to short & long.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 21:09:01 2013 +0100| [92002db3eb437414281ad4fb6e84e34862f7fc92] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92002db3eb437414281ad4fb6e84e34862f7fc92
---

 libavcodec/h264_refs.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index c3e7b7c..44d84d1 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -626,6 +626,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;