[SCM] libav/master: h264: reset ref count if decoding the slice header fails

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e8d27c8510a024e6d66d2e1116bb8692d9cb98a
Author: Anton Khirnov <anton at khirnov.net>
Date:   Thu Nov 28 10:54:35 2013 +0100

    h264: reset ref count if decoding the slice header fails
    
    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:libav-stable at libav.org

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index db336f0..7904e64 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4137,9 +4137,10 @@ again:
                 context_count = 0;
             }
 
-            if (err < 0)
+            if (err < 0) {
                 av_log(h->s.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

-- 
Libav/FFmpeg packaging