summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-01 19:04:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-23 14:28:10 +0100
commit325feb8e0d5141025548c20aebcbeb92dc2b3a07 (patch)
tree1870f39e26e2f4f50580b1d35b68a0e9d8706ed2
parent8c6a976feeea8ee0ccdb31fbddb0d9c98b44ae0d (diff)
downloadffmpeg-325feb8e0d5141025548c20aebcbeb92dc2b3a07.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 2b872476df..e4e25a8d53 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -631,6 +631,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);
if (!v->s.avctx->codec)