h264: error out on unset current_picture_ptr for h->current_slice > 0
authorJanne Grunau <janne-libav@jannau.net>
Wed, 21 Nov 2012 18:41:59 +0000 (19:41 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sat, 12 Jan 2013 16:59:40 +0000 (17:59 +0100)
Fixes a segfault with fuzzed sample sample_varPAR_s11622_r001-02.avi.

CC: libav-stable@libav.org
(cherry picked from commit 0b300daad2f5cb59a7c06dde5ac701685e6edf16)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/h264.c

index 1c5b841..c9940da 100644 (file)
@@ -2889,6 +2889,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
             s->picture_structure = last_pic_structure;
             s->dropable          = last_pic_dropable;
             return AVERROR_INVALIDDATA;
+        } else if (!s->current_picture_ptr) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "unset current_picture_ptr on %d. slice\n",
+                   h0->current_slice + 1);
+            return AVERROR_INVALIDDATA;
         }
     } else {
         /* Shorten frame num gaps so we don't have to allocate reference