[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55782] trunk/blender/source/blender/nodes /shader/node_shader_tree.c: fix for referencing freed memory when rendering materials ( could crash material preview).

Campbell Barton ideasman42 at gmail.com
Thu Apr 4 16:07:10 CEST 2013


Revision: 55782
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55782
Author:   campbellbarton
Date:     2013-04-04 14:07:10 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
fix for referencing freed memory when rendering materials (could crash material preview).

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

Modified: trunk/blender/source/blender/nodes/shader/node_shader_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/node_shader_tree.c	2013-04-04 14:00:31 UTC (rev 55781)
+++ trunk/blender/source/blender/nodes/shader/node_shader_tree.c	2013-04-04 14:07:10 UTC (rev 55782)
@@ -272,10 +272,12 @@
 void ntreeShaderEndExecTree(bNodeTreeExec *exec)
 {
 	if (exec) {
+		/* exec may get freed, so assign ntree */
+		bNodeTree *ntree = exec->nodetree;
 		ntreeShaderEndExecTree_internal(exec);
 		
 		/* XXX clear nodetree backpointer to exec data, same problem as noted in ntreeBeginExecTree */
-		exec->nodetree->execdata = NULL;
+		ntree->execdata = NULL;
 	}
 }
 




More information about the Bf-blender-cvs mailing list