Re: [9front] libjson can print invalid json

[ori@eigenstate.org]

Quoth Dave MacFarlane <driusan@driusan.net>:
> print("%J", json); can print invalid json if a JSON string in the object has a quotation mark in it.
> 
> I just threw together this patch to try and escape the strings from printjson() if anyone's interested
> in it.
> 
> diff 30c5296f32b87d83529d772732726891e1261c9c uncommitted
> --- a/sys/src/libjson/printjson.c
> +++ b/sys/src/libjson/printjson.c
> @@ -52,6 +52,38 @@
>  }
>  
>  static int
> +printstring(Fmt *f, char *s)
> +{
> +	int slen = strlen(s);
> +	int i, nq=0;
> +	int r;
> +	char *dup, lastq;
> +	for(i = 0; i < slen; i++)
> +		if (s[i] == '"') nq++;
> +
> +	if (nq == 0)
> +		return fmtprint(f, "\"%s\"", s);
> +
> +	r = fmtprint(f, "\"");
> +
> +	dup = strdup(s);
> +	lastq = -1;
> +	for(i = 0; i < slen; i++){
> +		if(dup[i] == '"') {
> +			dup[i] = 0;
> +			r += fmtprint(f, "%s\\\"", &dup[lastq+1]);
> +			lastq = i;
> +		}
> +	}
> +
> +	if (lastq != slen-1)
> +		r += fmtprint(f, "%s", &dup[lastq+1]);
> +	r += fmtprint(f, "\"");
> +	free(dup);
> +	return r;
> +}
> +

I think we have a problem with more than just quotes; we're
not allowed any control characters, and we need to escape '\';

how's something like this (untested)?


	static int
	printstring(Fmt *f, char *s)
	{
		int n;
	
		n = 0;
		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);
			}
		}
		return n;
	}