summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-07-04 03:52:36 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-07-04 03:52:36 +0000
commit0543f1a9b66d0fd8e53a1707e8736d7920a521f0 (patch)
tree08e8664f51ca73c4d73ae09c5f8ea01bb1b5864f
parentf671609d6e8e500d5775a880cda2bc739413746f (diff)
downloadeet-0543f1a9b66d0fd8e53a1707e8736d7920a521f0.tar.gz
backport eet_node fixes
SVN revision: 60959
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog3
-rw-r--r--src/lib/eet_node.c6
3 files changed, 10 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 6ec31c0..afdb972 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,3 +10,4 @@ Raphael Kubo da Costa <kubo@profusion.mobi>
Mathieu Taillefumier <mathieu.taillefumier@free.fr>
Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
Adam Simpkins <adam@adamsimpkins.net>
+Mike Blumenkrantz <mike@zentific.com>
diff --git a/ChangeLog b/ChangeLog
index dd3ba42..405d123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -495,3 +495,6 @@
* 1.4.1 release
+2011-07-04 Mike Blumenkrantz
+
+ * Fix segmentation faults in several eet_node functions
diff --git a/src/lib/eet_node.c b/src/lib/eet_node.c
index 35d820a..432b2ef 100644
--- a/src/lib/eet_node.c
+++ b/src/lib/eet_node.c
@@ -213,6 +213,8 @@ eet_node_struct_child_new(const char *parent,
{
Eet_Node *n;
+ if (!child) return NULL;
+
if (child->type != EET_G_UNKNOWN)
return child;
@@ -233,6 +235,7 @@ eet_node_list_append(Eet_Node *parent,
const char *tmp;
Eet_Node *nn;
+ if ((!parent) || (!child)) return;
tmp = eina_stringshare_add(name);
for (nn = parent->values; nn; nn = nn->next)
@@ -275,6 +278,7 @@ eet_node_struct_append(Eet_Node *parent,
Eet_Node *prev;
Eet_Node *nn;
+ if ((!parent) || (!child)) return;
if (parent->type != EET_G_UNKNOWN)
{
ERR("[%s] is not a structure. Will not insert [%s] in it",
@@ -322,6 +326,8 @@ eet_node_hash_add(Eet_Node *parent,
{
Eet_Node *nn;
+ if ((!parent) || (!child)) return;
+
/* No list found, so create it. */
nn = eet_node_hash_new(name, key, child);