summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-01 19:04:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-08 15:32:44 +0100
commitb66a0dce117a89db304b82dc2498c9a70c7dcecd (patch)
tree4ce1cba5f1f3731b8691722cbee74c1e5fe432bf
parentc598a46821f001fe73b69a59432716ad84e68cf5 (diff)
downloadffmpeg-b66a0dce117a89db304b82dc2498c9a70c7dcecd.tar.gz
avcodec/vc1: reset fcm/field_mode in non advanced header parsing
Fixes NULL pointer dereference Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b51e9354772de446e8196dabf9aad1567b22f74d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 95ac93c7ee..0120b8e231 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -580,6 +580,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
{
int pqindex, lowquant, status;
+ v->field_mode = 0;
+ v->fcm = 0;
if (v->finterpflag)
v->interpfrm = get_bits1(gb);
skip_bits(gb, 2); //framecnt unused