[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40648] trunk/blender/source/blender/ makesrna/intern/rna_sequencer.c: Fix #28601: SEGFAULT: Regression in free_imbuf_seq

Sergey Sharybin g.ulairi at gmail.com
Wed Sep 28 10:56:40 CEST 2011


Revision: 40648
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40648
Author:   nazgul
Date:     2011-09-28 08:56:40 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Fix #28601: SEGFAULT: Regression in free_imbuf_seq

Actually, it's NULL-pointer dereference in rna_Sequence_update caused by RNA cache.

Discussed with Joshua and he thought it's acceptable for now to add
extra NULL-check here.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2011-09-28 08:31:02 UTC (rev 40647)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2011-09-28 08:56:40 UTC (rev 40648)
@@ -559,7 +559,8 @@
 {
 	Editing *ed= seq_give_editing(scene, FALSE);
 
-	free_imbuf_seq(scene, &ed->seqbase, FALSE, TRUE);
+	if(ed)
+		free_imbuf_seq(scene, &ed->seqbase, FALSE, TRUE);
 }
 
 static void rna_Sequence_update_reopen_files(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)




More information about the Bf-blender-cvs mailing list