On 2014-01-06 08:36:38 +0100, Anton Khirnov wrote: > Otherwise the ER code might try to use some already freed references. > > Fixes possible access to freed memory. > > Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC:[email protected] > --- > libavcodec/h264.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/h264.c b/libavcodec/h264.c > index ed5aea8..6f329aa 100644 > --- a/libavcodec/h264.c > +++ b/libavcodec/h264.c > @@ -4813,9 +4813,10 @@ again: > context_count = 0; > } > > - if (err < 0) > + if (err < 0) { > av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header > error\n"); > - else if (err == 1) { > + h->ref_count[0] = h->ref_count[1] = h->list_count = 0; > + } else if (err == 1) { > /* Slice could not be decoded in parallel mode, copy down > * NAL unit stuff to context 0 and restart. Note that > * rbsp_buffer is not transferred, but since we no longer
probably ok Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
