[libav-stable] [libav-commits] h264: check context state before decoding slice data partitions

Reinhard Tartler siretart at gmail.com
Sat Jan 12 17:00:43 CET 2013


On Thu, Nov 29, 2012 at 2:45 PM, Janne Grunau <git at libav.org> wrote:
> Module: libav
> Branch: master
> Commit: c1fcf563b13051f280db169ba41c6a1b21b25e08
>
> Author:    Janne Grunau <janne-libav at jannau.net>
> Committer: Janne Grunau <janne-libav at jannau.net>
> Date:      Wed Nov 28 22:17:14 2012 +0100
>
> 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
>
> ---
>
>  libavcodec/h264.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> 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  ||


This patch does not seem to apply to 0.8 at all, right?


-- 
regards,
    Reinhard


More information about the libav-stable mailing list