Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-06-13 15:49:22 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-06-13 15:49:22 +0400
commiteb136fcbec33288411838dae8105fa17dc8ffecd (patch)
tree04894be06b150128d3c82d6c5f55ed49e86a6775 /source/blender/blenkernel/intern/node.c
parent65047099b2618d67b2e78e71318fdff4e7c3af16 (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index d40e0daf247..152d74f2ad6 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1999,7 +1999,11 @@ static bNodeSocket *make_socket_interface(bNodeTree *ntree, int in_out,
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);