X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftal%2Fstr%2Fstr.c;h=4b3b11aa603cf23733ec9aa24251e602c2c7723f;hb=ed6dd33e06c0e8f1c4dd006e0b70d9f2d6ba6c09;hp=059817b6aa7e928b8e9ceeef372e2510b6ebd3f3;hpb=c8e75cdce11b3ad7db6c1fff580c587395b59965;p=ccan

diff --git a/ccan/tal/str/str.c b/ccan/tal/str/str.c
index 059817b6..4b3b11aa 100644
--- a/ccan/tal/str/str.c
+++ b/ccan/tal/str/str.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <ccan/str/str.h>
-#include <ccan/take/take.h>
 
 char *tal_strdup(const tal_t *ctx, const char *p)
 {
@@ -26,11 +25,9 @@ char *tal_strndup(const tal_t *ctx, const char *p, size_t n)
 	char *ret;
 
 	/* We have to let through NULL for take(). */
-	if (likely(p)) {
-		len = strlen(p);
-		if (len > n)
-			len = n;
-	} else
+	if (likely(p))
+		len = strnlen(p, n);
+	else
 		len = n;
 
 	ret = tal_dup_(ctx, p, 1, len, 1, false, TAL_LABEL(char, "[]"));
@@ -54,7 +51,7 @@ char *tal_fmt(const tal_t *ctx, const char *fmt, ...)
 static bool do_vfmt(char **buf, size_t off, const char *fmt, va_list ap)
 {
 	/* A decent guess to start. */
-	size_t max = strlen(fmt) * 2;
+	size_t max = strlen(fmt) * 2 + 1;
 	bool ok;
 
 	for (;;) {