[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58655] trunk/blender/source/blender/nodes /texture/node_texture_tree.c: fix for writing to freed memory enabling texture node tree

Campbell Barton ideasman42 at gmail.com
Sat Jul 27 10:21:43 CEST 2013


Revision: 58655
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58655
Author:   campbellbarton
Date:     2013-07-27 08:21:43 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
fix for writing to freed memory enabling texture node tree

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/texture/node_texture_tree.c

Modified: trunk/blender/source/blender/nodes/texture/node_texture_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/node_texture_tree.c	2013-07-27 08:06:46 UTC (rev 58654)
+++ trunk/blender/source/blender/nodes/texture/node_texture_tree.c	2013-07-27 08:21:43 UTC (rev 58655)
@@ -283,10 +283,12 @@
 void ntreeTexEndExecTree(bNodeTreeExec *exec)
 {
 	if (exec) {
+		/* exec may get freed, so assign ntree */
+		bNodeTree *ntree = exec->nodetree;
 		ntreeTexEndExecTree_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