tal: tal_parent(NULL) should be NULL.

[ccan] / ccan / tal / tal.c

diff --git a/ccan/tal/tal.c b/ccan/tal/tal.c
index 612c67bb833f65de486a3c0d534487efc761d85e..ff25db19afb8a3b16da50ef254687a85b50cc71e 100644 (file)
--- a/ccan/tal/tal.c
+++ b/ccan/tal/tal.c
@@ -294,6 +294,7 @@ static struct children *add_child_property(struct tal_hdr *parent,
 
                init_group_property(&prop->group, prop, child);
                list_head_init(&prop->group.list);
+               update_bounds(&prop->group);
        }
        return prop;
 }
@@ -316,8 +317,7 @@ static bool add_child(struct tal_hdr *parent, struct tal_hdr *child)
                children = add_child_property(parent, child);
                if (!children)
                        return false;
-               children->group.list.n.next = children->group.list.n.prev
-                       = &children->group.list.n;
+               list_head_init(&children->group.list);
 
                /* Child links to itself. */
                 child->next = child;
@@ -638,7 +638,12 @@ tal_t *tal_next(const tal_t *root, const tal_t *prev)
 tal_t *tal_parent(const tal_t *ctx)
 {
         struct group *group;
-        struct tal_hdr *t = debug_tal(to_tal_hdr(ctx));
+        struct tal_hdr *t;
+
+       if (!ctx)
+               return NULL;
+
+       t = debug_tal(to_tal_hdr(ctx));
 
        while (!(group = find_property(t, GROUP)))
                t = t->next;
@@ -887,7 +892,8 @@ static bool check_node(struct group *group,
                        name = (struct name *)p;
                        break;
                }
-               if (p != &null_parent.c.hdr && !in_bounds(p))
+               if (p != &null_parent.c.hdr && p != &null_parent.c.group.hdr
+                   && !in_bounds(p))
                        return check_err(t, errorstr,
                                         "has bad property pointer");