X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fopt%2Fhelpers.c;fp=ccan%2Fopt%2Fhelpers.c;h=43b86d7ca2ad953665522cf37f449b8046ffd3b7;hb=7220240c0e2fa8c9610736565e73d3c74a73466c;hp=c557f96d8488d01d3e1297ea235f6c2c8b76fb4f;hpb=63b0055673d2c55ff90f8b7bd8a7c5fe30f83269;p=ccan

diff --git a/ccan/opt/helpers.c b/ccan/opt/helpers.c
index c557f96d..43b86d7c 100644
--- a/ccan/opt/helpers.c
+++ b/ccan/opt/helpers.c
@@ -202,14 +202,19 @@ void opt_show_invbool(char buf[OPT_SHOW_LEN], const bool *b)
 
 void opt_show_charp(char buf[OPT_SHOW_LEN], char *const *p)
 {
-	size_t len = strlen(*p);
-	buf[0] = '"';
-	if (len > OPT_SHOW_LEN - 2)
-		len = OPT_SHOW_LEN - 2;
-	strncpy(buf+1, *p, len);
-	buf[1+len] = '"';
-	if (len < OPT_SHOW_LEN - 2)
-		buf[2+len] = '\0';
+	if (*p){
+		size_t len = strlen(*p);
+		buf[0] = '"';
+		if (len > OPT_SHOW_LEN - 2)
+			len = OPT_SHOW_LEN - 2;
+		strncpy(buf+1, *p, len);
+		buf[1+len] = '"';
+		if (len < OPT_SHOW_LEN - 2)
+			buf[2+len] = '\0';
+	}
+	else {
+		strncpy(buf, "(nil)", OPT_SHOW_LEN);
+	}
 }
 
 /* Show an integer value, various forms. */