1 From d6c184880ee2e09fd68c0ae217173832cee5afc1 Mon Sep 17 00:00:00 2001
2 From: Michael Niedermayer <michaelni@gmx.at>
3 Date: Sun, 18 Nov 2012 16:29:04 +0100
4 Subject: [PATCH] h264: correct ref count check and limit, fix out of array
7 Upstream-Status: Backport
9 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 libavcodec/h264.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
15 diff --git a/libavcodec/h264.c b/libavcodec/h264.c
16 index da43f1e..32cede5 100644
17 --- a/gst-libs/ext/libav/libavcodec/h264.c
18 +++ b/gst-libs/ext/libav/libavcodec/h264.c
19 @@ -2870,6 +2870,9 @@ static int decode_slice_header(H264Conte
20 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
21 if(h->slice_type_nos==AV_PICTURE_TYPE_B)
22 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
24 + // full range is spec-ok in this case, even for frames
25 + h->ref_count[1] = 1;
27 if(h->ref_count[0]-1 > 32-1 || h->ref_count[1]-1 > 32-1){
28 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
