[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec ffv1.c,1.35,1.36

Michael Niedermayer CVS michael
Thu Feb 9 10:38:06 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv16581

Modified Files:
	ffv1.c 
Log Message:
fix segfault on broken streams


Index: ffv1.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ffv1.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ffv1.c	12 Jan 2006 22:43:15 -0000	1.35
+++ ffv1.c	9 Feb 2006 09:38:03 -0000	1.36
@@ -959,11 +959,14 @@
     p->pict_type= FF_I_TYPE; //FIXME I vs. P
     if(get_rac(c, &keystate)){
         p->key_frame= 1;
-        read_header(f);
+        if(read_header(f) < 0)
+            return -1;
         clear_state(f);
     }else{
         p->key_frame= 0;
     }
+    if(!f->plane[0].state && !f->plane[0].vlc_state)
+        return -1;
 
     p->reference= 0;
     if(avctx->get_buffer(avctx, p) < 0){





More information about the ffmpeg-cvslog mailing list