From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU autolearn=ham autolearn_force=no version=3.4.4
Received: (qmail 11717 invoked from network); 18 Nov 2022 14:53:37 -0000
Received: from 9front.inri.net (168.235.81.73)
  by inbox.vuxu.org with ESMTPUTF8; 18 Nov 2022 14:53:37 -0000
Received: from driusan.net ([207.148.18.58]) by 9front; Fri Nov 18 09:52:37 -0500 2022
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=driusan.net; s=20180128; h=From:Date:Subject:To; bh=LPoTZT2nsfDBnU1krs5acW9iJT3zlLLFQmuZvW5svrQ=; b=OKfy0ndKwFnULwAvV/bDO7G1OMA5EIG5diQev4Lp//6UXwT8inmcL5i7FTzW+2pyEpX9fs4l3do/hHMwLDu2vVY5On9ZILKmAbcAS5wJnzOftvuSMpsk0W0h6plw5vn48PR2jOnRAkKIArMqOoKmJSTlSzIJsVACj6DWK/NPyayrvBrzje6DkLxFlym9Rajm0zdexz42AUAif1ocqENV6pc21/VdSSPpgR4DJ+ZTW02DbH7LZNlFHI6tylIR6DtrYBes5O5Et3KRR7mPufF8RBwZRGD0LQknA37OFWGxbCHevSXbuMyEBjUWR7w6ut20go2hSNpEyYwX3PEpsfzNxA==
Message-ID: <263B428AAAD6B50FBA408C8673B0144A@driusan.net>
From: "Dave MacFarlane" <driusan@driusan.net>
Date: Fri, 18 Nov 2022 09:52:36 -0500
To: 9front@9front.org
In-Reply-To: <570432963688607A01A28D3D1092E22D@driusan.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: realtime-java storage injection controller 
Subject: Re: [9front] libjson can print invalid json
Reply-To: 9front@9front.org
Precedence: bulk

I was curious about keys and it looks like there's also a bug
where they're not being properly escaped. Here's a diff that
fixes that as well.

cpu% git/diff .
diff 30c5296f32b87d83529d772732726891e1261c9c uncommitted
--- a/sys/src/libjson/printjson.c
+++ b/sys/src/libjson/printjson.c
@@ -7,6 +7,32 @@
 static int printobject(Fmt*, JSON*, int);
 
 static int
+printstring(Fmt *f, char *s)
+{
+	int n;
+	
+	n = fmtrune(f, '"');
+	for(; *s; s++){
+		switch(*s){
+		case '\\':	n += fmtstrcpy(f, "\\\\");	break;
+		case '\f':	n += fmtstrcpy(f, "\\f");	break;
+		case '\b':	n += fmtstrcpy(f, "\\b");	break;
+		case '\n':	n += fmtstrcpy(f, "\\n");	break;
+		case '\r':	n += fmtstrcpy(f, "\\r");	break;
+		case '\"':	n += fmtstrcpy(f, "\\\"");	break;
+		default:
+
+			if(*s < 0x20)
+				n += fmtprint(f, "\\u%04x", *s);
+			else
+				n += fmtrune(f, *s);
+		}
+	}
+	n = fmtrune(f, '"');
+	return n;
+}
+
+static int
 printarray(Fmt *f, JSON *j, int indent)
 {
 	JSONEl *jl;
@@ -41,7 +67,8 @@
 	for(jl = j->first; jl != nil; jl = jl->next){
 		for(i = 0; i < indent; i++)
 			fmtprint(f, "\t");
-		r += fmtprint(f, "\"%s\": ", jl->name);
+		r += printstring(f, jl->name);
+		r += fmtprint(f, ": ");
 		r += printjson(f, jl->val, indent);
 		r += fmtprint(f, "%s\n", jl->next != nil ? "," : "");
 	}
@@ -65,7 +92,7 @@
 		return fmtprint(f, "%f", j->n);
 		break;
 	case JSONString:
-		return fmtprint(f, "\"%s\"", j->s);
+		return printstring(f, j->s);
 		break;
 	case JSONArray:
 		return printarray(f, j, indent+1);