conf: null guard in ConfNodeLookupChild

Add NULL guarding to the lookup so callers can process nodes
in a loop with less error checking.

Addresses issue #1660.

diff --git a/src/conf.c b/src/conf.c
index 88b9389c58e938002b8a316553b36d9bd2254e6c..e279a526d7ee34627bc4c2f3148ce11f9fdf2fd9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -722,8 +722,12 @@ ConfNode *ConfNodeLookupChild(const ConfNode *node, const char *name)
 {
     ConfNode *child;
 
+    if (node == NULL || name == NULL) {
+        return NULL;
+    }
+
     TAILQ_FOREACH(child, &node->head, next) {
-        if (strcmp(child->name, name) == 0)
+        if (child->name != NULL && strcmp(child->name, name) == 0)
             return child;
     }
 
@@ -1050,6 +1054,7 @@ static int ConfTestGetBool(void)
 
 static int ConfNodeLookupChildTest(void)
 {
+    int retval = 0;
     char *test_vals[] = { "one", "two", "three" };
     size_t u;
 
@@ -1065,35 +1070,44 @@ static int ConfNodeLookupChildTest(void)
 
     child = ConfNodeLookupChild(parent, "one");
     if (child == NULL)
-        return 0;
+        goto end;
     if (strcmp(child->name, "one") != 0)
-        return 0;
+        goto end;
     if (strcmp(child->val, "one") != 0)
-        return 0;
+        goto end;
 
     child = ConfNodeLookupChild(parent, "two");
     if (child == NULL)
-        return 0;
+        goto end;
     if (strcmp(child->name, "two") != 0)
-        return 0;
+        goto end;
     if (strcmp(child->val, "two") != 0)
-        return 0;
+        goto end;
 
     child = ConfNodeLookupChild(parent, "three");
     if (child == NULL)
-        return 0;
+        goto end;
     if (strcmp(child->name, "three") != 0)
-        return 0;
+        goto end;
     if (strcmp(child->val, "three") != 0)
-        return 0;
+        goto end;
 
     child = ConfNodeLookupChild(parent, "four");
     if (child != NULL)
-        return 0;
+        goto end;
 
-    ConfNodeFree(parent);
+    if (ConfNodeLookupChild(NULL, NULL) != NULL) {
+        goto end;
+    }
 
-    return 1;
+    retval = 1;
+
+end:
+    if (parent != NULL) {
+        ConfNodeFree(parent);
+    }
+
+    return retval;
 }
 
 static int ConfNodeLookupChildValueTest(void)