[FFmpeg-cvslog] avcodec/vc1: reset fcm/field_mode in non advanced header parsing

Michael Niedermayer git at videolan.org
Sat Mar 8 16:48:16 CET 2014


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  1 19:04:37 2014 +0100| [5b38967745e9abfaf8cdfb356a1040f6ec214f77] | 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=5b38967745e9abfaf8cdfb356a1040f6ec214f77
---

 libavcodec/vc1.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index d7352d3..deb4efe 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -583,6 +583,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)



More information about the ffmpeg-cvslog mailing list