[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57247] trunk/blender/source/blender/nodes /shader/nodes/node_shader_common.c: Fix #35625, crash with NULL pointer after node render.

Lukas Toenne lukas.toenne at googlemail.com
Wed Jun 5 10:23:45 CEST 2013


Revision: 57247
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57247
Author:   lukastoenne
Date:     2013-06-05 08:23:44 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
Fix #35625, crash with NULL pointer after node render. Happens when node group node_tree pointer is NULL, then the group node doesn not produce any execdata and needs to check this accordingly in the
freeexec callback.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c	2013-06-05 06:34:18 UTC (rev 57246)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c	2013-06-05 08:23:44 UTC (rev 57247)
@@ -89,7 +89,8 @@
 {
 	bNodeTreeExec *gexec = (bNodeTreeExec *)nodedata;
 	
-	ntreeShaderEndExecTree_internal(gexec);
+	if (gexec)
+		ntreeShaderEndExecTree_internal(gexec);
 }
 
 /* Copy inputs to the internal stack.




More information about the Bf-blender-cvs mailing list