[FFmpeg-cvslog] avcodec/vc1: reset fcm/field_mode in non advanced header parsing
Michael Niedermayer
git at videolan.org
Sat Mar 8 16:21:08 CET 2014
ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 1 19:04:37 2014 +0100| [b66a0dce117a89db304b82dc2498c9a70c7dcecd] | committer: Michael Niedermayer
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 at gmx.at>
(cherry picked from commit b51e9354772de446e8196dabf9aad1567b22f74d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b66a0dce117a89db304b82dc2498c9a70c7dcecd
---
libavcodec/vc1.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 95ac93c..0120b8e 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
More information about the ffmpeg-cvslog
mailing list