double quotes at begin of string

handling of double quotes surrounding string was naive; fix that added test 16 closes #47
jpmens · Jan 19, 2017 · 935a324 · 935a324
1 parent 2779022
commit 935a324
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/jo.c b/jo.c
@@ -119,11 +119,14 @@ JsonNode *vnode(char *str, int flags)
 	/* If str begins with a double quote, keep it a string */
 
 	if (*str == '"') {
+#if 0
 		char *bp = str + strlen(str) - 1;
 
 		if (bp > str && *bp == '"')
 			*bp = 0;		/* Chop closing double quote */
 		return json_mkstring(str + 1);
+#endif
+		return json_mkstring(str);
 	}
 
 	char *endptr;

diff --git a/tests/jo.11.exp b/tests/jo.11.exp
@@ -1 +1 @@
-[true,false,null,"true","false","null"]
+[true,false,null,"\"true\"","\"false\"","\"null\""]
diff --git a/tests/jo.16.exp b/tests/jo.16.exp
@@ -0,0 +1 @@
+{"msg":"\"All's Well\", she said."}
diff --git a/tests/jo.16.sh b/tests/jo.16.sh
@@ -0,0 +1,7 @@
+# quotes in quotes
+tmp=/tmp/jo.$$
+trap "rm -f $tmp; exit" 0 1 2 15
+
+${JO:-jo} msg='"All'\''s Well", she said.'
+
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[true,false,null,"true","false","null"]
		[true,false,null,"\"true\"","\"false\"","\"null\""]