Merge 63f67ee4fb into 82f5a4ab29

json_object.c

@@ -136,7 +136,7 @@ static int json_escape_str(struct printbuf *pb, const char *str, int len, int fl
 			else if(c == '\f') printbuf_memappend(pb, "\\f", 2);
 			else if(c == '"') printbuf_memappend(pb, "\\\"", 2);
 			else if(c == '\\') printbuf_memappend(pb, "\\\\", 2);
-			else if(c == '/') printbuf_memappend(pb, "\\/", 2);
+			else if(c == '/') printbuf_memappend(pb, "/", 1);
 
 			start_offset = ++pos;
 			break;

tests/test_parse.c

@@ -309,7 +309,7 @@ struct incremental_step {
 	{ "\"\\n\"",         -1, -1, json_tokener_success, 0 },
 	{ "\"\\r\"",         -1, -1, json_tokener_success, 0 },
 	{ "\"\\t\"",         -1, -1, json_tokener_success, 0 },
-	{ "\"\\/\"",         -1, -1, json_tokener_success, 0 },
+	{ "\"/\"",         -1, -1, json_tokener_success, 0 },
 	// Escaping a forward slash is optional
 	{ "\"/\"",           -1, -1, json_tokener_success, 0 },