Unicode escapes *are* required for JSON control characters

Author: mikee47

Sming/Core/Data/Format/Formatter.cpp

@@ -58,7 +58,7 @@ unsigned escapeControls(String& value, Options options)
 		if(escapeChar(c, options)) {
 			extra += 1; // "\"
 		} else if(options[Option::unicode]) {
-			if(uint8_t(c) < 0x20 || (c & 0x80)) {
+			if(uint8_t(c) < 0x20) {
 				extra += 5; // "\uNNNN"
 			}
 		} else if(uint8_t(c) < 0x20) {
@@ -86,7 +86,7 @@ unsigned escapeControls(String& value, Options options)
 			*out++ = '\\';
 			c = esc;
 		} else if(options[Option::unicode]) {
-			if(uint8_t(c) < 0x20 || (c & 0x80)) {
+			if(uint8_t(c) < 0x20) {
 				*out++ = '\\';
 				*out++ = 'u';
 				*out++ = '0';

Sming/Core/Data/Format/Json.cpp

@@ -27,7 +27,7 @@ Json json;
  */
 void Json::escape(String& value) const
 {
-	escapeControls(value, Option::doublequote | Option::backslash);
+	escapeControls(value, Option::unicode | Option::doublequote | Option::backslash);
 }
 
 void Json::quote(String& value) const

tests/HostTests/modules/Formatter.cpp

@@ -17,7 +17,7 @@ class FormatterTest : public TestGroup
 		TEST_CASE("JSON")
 		{
 			DEFINE_FSTR_LOCAL(text1b, "A JSON\\ntest string\\twith escapes\\u0012\\u0000\\n"
-									  "Worth \\\"maybe\\\" \\u00a3 0.53. Yen \\u00a5 5bn.")
+									  "Worth \\\"maybe\\\" \xa3 0.53. Yen \xa5 5bn.")
 
 			Serial << text1 << endl;
 			String s(text1);