[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60574] trunk/blender/source/blender/ editors/space_node/node_edit.c: Fix for Output File node operators: added a sanity type check to avoid using invalid node data.

[Lukas Toenne]

Revision: 60574
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60574
Author:   lukastoenne
Date:     2013-10-06 10:28:09 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Fix for Output File node operators: added a sanity type check to avoid using 
invalid node data.
Reported by Sebastian Koenig in unrelated bug report #36968.

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 2013-10-05 
19:56:34 UTC (rev 60573)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2013-10-06 
10:28:09 UTC (rev 60574)
@@ -1731,7 +1731,7 @@
                node = nodeGetActive(snode->edittree);
        }
 
-       if (!node)
+       if (!node || node->type != CMP_NODE_OUTPUT_FILE)
                return OPERATOR_CANCELLED;
 
        RNA_string_get(op->ptr, "file_path", file_path);
@@ -1777,7 +1777,7 @@
                node = nodeGetActive(snode->edittree);
        }
 
-       if (!node)
+       if (!node || node->type != CMP_NODE_OUTPUT_FILE)
                return OPERATOR_CANCELLED;
        
        if (!ntreeCompositOutputFileRemoveActiveSocket(ntree, node))
@@ -1819,7 +1819,7 @@
        else if (snode && snode->edittree)
                node = nodeGetActive(snode->edittree);
 
-       if (!node)
+       if (!node || node->type != CMP_NODE_OUTPUT_FILE)
                return OPERATOR_CANCELLED;
 
        nimf = node->storage;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs