[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48865] trunk/blender/source/blender/ editors/space_node/node_edit.c: Fix #32051, Ungroup operator crashes.

Lukas Toenne lukas.toenne at googlemail.com
Thu Jul 12 17:14:50 CEST 2012


Revision: 48865
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48865
Author:   lukastoenne
Date:     2012-07-12 15:14:50 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Fix #32051, Ungroup operator crashes. The link iterator can be invalidated when unconnected input links are removed.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2012-07-12 14:41:52 UTC (rev 48864)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2012-07-12 15:14:50 UTC (rev 48865)
@@ -1200,7 +1200,8 @@
 			nodeRemLink(wgroup, link);
 	}
 	/* restore links from internal nodes */
-	for (link = wgroup->links.first; link; link = link->next) {
+	for (link = wgroup->links.first; link; link = linkn) {
+		linkn = link->next;
 		/* indicates link to group input */
 		if (!link->fromnode) {
 			/* NB: can't use find_group_node_input here,




More information about the Bf-blender-cvs mailing list