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:
authorLukas Toenne <lukas.toenne@googlemail.com>2012-01-21 20:36:06 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2012-01-21 20:36:06 +0400
commitb7fbfdbf5695a717b3e467d20abc25038febe50d (patch)
treec5f65c0693423f120f54ee327d8e1ae1c859e8f7 /source/blender/nodes
parentae771e742b44119352255bd604e4ffcf427e5049 (diff)
Fix for missing NULL check in socket default_value free function. Some sockets (currently only cycles shader sockets) don't actually have a default_value pointer.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/intern/node_socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 4f8ba032873..f03aff8fb92 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -190,7 +190,8 @@ void *node_socket_make_default_value(int type)
void node_socket_free_default_value(int UNUSED(type), void *default_value)
{
/* XXX can just free the pointee for all current socket types. */
- MEM_freeN(default_value);
+ if (default_value)
+ MEM_freeN(default_value);
}
void node_socket_init_default_value(int type, void *default_value)