From: Janne Grunau Date: Wed, 28 Nov 2012 21:17:14 +0000 (+0100) Subject: h264: check context state before decoding slice data partitions X-Git-Tag: n1.1~19^2~261 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=c1fcf563b13051f280db169ba41c6a1b21b25e08;ds=sidebyside 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@libav.org --- diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8b9ac5c232..e3075cbe6f 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 ||