[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57430] trunk/blender/source/blender/ blenkernel/intern/node.c: Added NULL check for socket type make_socket_interface

Sergey Sharybin sergey.vfx at gmail.com
Thu Jun 13 13:49:22 CEST 2013


Revision: 57430
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57430
Author:   nazgul
Date:     2013-06-13 11:49:22 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Added NULL check for socket type make_socket_interface

Without this check it's easy to crash blender by passing
non-existing socket type to sockets.new() function.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-06-13 11:35:25 UTC (rev 57429)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-06-13 11:49:22 UTC (rev 57430)
@@ -1999,7 +1999,11 @@
 	bNodeSocketType *stype = nodeSocketTypeFind(idname);
 	bNodeSocket *sock;
 	int own_index = ntree->cur_index++;
-	
+
+	if (stype == NULL) {
+		return NULL;
+	}
+
 	sock = MEM_callocN(sizeof(bNodeSocket), "socket template");
 	BLI_strncpy(sock->idname, stype->idname, sizeof(sock->idname));
 	node_socket_set_typeinfo(ntree, sock, stype);




More information about the Bf-blender-cvs mailing list