[FFmpeg-cvslog] h264: check context state before decoding slice data partitions

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Nov 28 22:17:14 2012 +0100| [c1fcf563b13051f280db169ba41c6a1b21b25e08] | committer: Janne Grunau

h264: check context state before decoding slice data partitions

Fixes mov_h264_aac__Demo_FlagOfOurFathers.mov.SIGSEGV.4e9.656.

Found-by: Mateusz "j00ru" Jurczyk
CC: libav-stable at libav.org

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

 libavcodec/h264.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8b9ac5c..e3075cb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3848,6 +3848,7 @@ again:
                 if (hx->redundant_pic_count == 0 &&
                     hx->intra_gb_ptr &&
                     hx->s.data_partitioning &&
+                    s->current_picture_ptr &&
                     s->context_initialized &&
                     (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) &&
                     (avctx->skip_frame < AVDISCARD_BIDIR  ||