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

Michael Niedermayer git at videolan.org
Tue Feb 4 05:03:52 CET 2014


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

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

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index d988668..0d4077b 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -581,6 +581,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