aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-01 19:04:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-10 18:51:50 +0100
commit4e47ae4e716256cfe77f9bf63a3638395c4d57b5 (patch)
tree0ec8b205681d0870236d9e4149db233fa48b7f36
parent5cab56dc9e405eaeb6aa792e34ec2a4f90949ad1 (diff)
downloadffmpeg-4e47ae4e716256cfe77f9bf63a3638395c4d57b5.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 daf6325c0c..e84cc0f88b 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -578,6 +578,8 @@ int 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