X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftal%2Ftal.c;h=612c67bb833f65de486a3c0d534487efc761d85e;hp=e575130568ca26913ad97ed00fa2feb6f4cf7740;hb=da9f271b74088191908e69f01acfbe05c390a87f;hpb=0e34459a02e2615f50bac2767c7dce6632470946

diff --git a/ccan/tal/tal.c b/ccan/tal/tal.c
index e5751305..612c67bb 100644
--- a/ccan/tal/tal.c
+++ b/ccan/tal/tal.c
@@ -417,7 +417,7 @@ static void del_tree(struct tal_hdr *t)
         freefn(t);
 }
 
-void *tal_alloc_(const tal_t *ctx, size_t size, bool clear)
+void *tal_alloc_(const tal_t *ctx, size_t size, bool clear, const char *label)
 {
         struct tal_hdr *child, *parent = debug_tal(to_tal_hdr_or_null(ctx));
 
@@ -426,7 +426,7 @@ void *tal_alloc_(const tal_t *ctx, size_t size, bool clear)
 		return NULL;
 	if (clear)
 		memset(from_tal_hdr(child), 0, size);
-        child->prop = NULL;
+        child->prop = (void *)label;
         if (!add_child(parent, child)) {
 		freefn(child);
 		return NULL;
@@ -706,7 +706,12 @@ char *tal_strndup(const tal_t *ctx, const char *p, size_t n)
 
 void *tal_memdup(const tal_t *ctx, const void *p, size_t n)
 {
-	void *ret = tal_arr(ctx, char, n);
+	void *ret;
+
+	if (ctx == TAL_TAKE)
+		return (void *)p;
+
+	ret = tal_arr(ctx, char, n);
 	if (ret)
 		memcpy(ret, p, n);
 	return ret;
@@ -727,9 +732,14 @@ char *tal_asprintf(const tal_t *ctx, const char *fmt, ...)
 char *tal_vasprintf(const tal_t *ctx, const char *fmt, va_list ap)
 {
 	size_t max = strlen(fmt) * 2;
-	char *buf = tal_arr(ctx, char, max);
+	char *buf;
 	int ret;
 
+	if (ctx == TAL_TAKE)
+		buf = tal_arr(tal_parent(fmt), char, max);
+	else
+		buf = tal_arr(ctx, char, max);
+
 	while (buf) {
 		va_list ap2;
 
@@ -741,6 +751,8 @@ char *tal_vasprintf(const tal_t *ctx, const char *fmt, va_list ap)
 			break;
 		buf = tal_resize(buf, max *= 2);
 	}
+	if (ctx == TAL_TAKE)
+		tal_free(fmt);
 	return buf;
 }