added '/' to the characters escaped in JSON

aleks-f · aleks-f · commit 5cd3e842e854 · 2014-05-28T21:05:30.000-05:00
diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp
@@ -70,9 +70,13 @@ void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int inde
 void Stringifier::formatString(const std::string& value, std::ostream& out)
 {
 	out << '"';
-	for (std::string::const_iterator it = value.begin(); it != value.end(); ++it)
+	for (std::string::const_iterator it = value.begin(),
+		 end = value.end(); it != end; ++it)
 	{
-		if (*it <= 0x1F || *it == '"' || *it == '\\') out << '\\';
+		if (*it <= 0x1F || *it == '"' || *it == '\\' || *it == '/')
+		{
+			out << '\\';
+		}
 		out << *it;
 	}
 	out << '"';
diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp
@@ -1231,7 +1231,7 @@ void JSONTest::testStringify()
 	std::stringstream ss;
 	jObj.stringify(ss);
 
-	assert(ss.str() == "{\"bar/\":0,\"baz\":0,\"foo\\\\\":0,\"q\\\"uote\\\"d\":0}");
+	assert(ss.str() == "{\"bar\\/\":0,\"baz\":0,\"foo\\\\\":0,\"q\\\"uote\\\"d\":0}");
 
 	std::string json = "{ \"Simpsons\" : { \"husband\" : { \"name\" : \"Homer\" , \"age\" : 38 }, \"wife\" : { \"name\" : \"Marge\", \"age\" : 36 }, "
 						"\"children\" : [ \"Bart\", \"Lisa\", \"Maggie\" ], "

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,13 @@ void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int inde`
`70`	`70`	`void Stringifier::formatString(const std::string& value, std::ostream& out)`
`71`	`71`	`{`
`72`	`72`	`out << '"';`
`73`		`- for (std::string::const_iterator it = value.begin(); it != value.end(); ++it)`
	`73`	`+ for (std::string::const_iterator it = value.begin(),`
	`74`	`+ end = value.end(); it != end; ++it)`
`74`	`75`	`{`
`75`		`- if (it <= 0x1F \|\| it == '"' \|\| *it == '\\') out << '\\';`
	`76`	`+ if (it <= 0x1F \|\| it == '"' \|\| it == '\\' \|\| it == '/')`
	`77`	`+ {`
	`78`	`+ out << '\\';`
	`79`	`+ }`
`76`	`80`	`out << *it;`
`77`	`81`	`}`
`78`	`82`	`out << '"';`