Skip to content

Commit

Permalink
Merge pull request #6339
Browse files Browse the repository at this point in the history
77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
  • Loading branch information
laanwj committed Jun 25, 2015
2 parents 91389e5 + 77aeb7c commit c3f0490
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/test/univalue_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
}

static const char *json1 =
"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]";
"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian http://test.com\"}}]";

BOOST_AUTO_TEST_CASE(univalue_readwrite)
{
Expand Down
1 change: 0 additions & 1 deletion src/univalue/gen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ static void initJsonEscape()
{
escapes[(int)'"'] = "\\\"";
escapes[(int)'\\'] = "\\\\";
escapes[(int)'/'] = "\\/";
escapes[(int)'\b'] = "\\b";
escapes[(int)'\f'] = "\\f";
escapes[(int)'\n'] = "\\n";
Expand Down
2 changes: 1 addition & 1 deletion src/univalue/univalue_escapes.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static const char *escapes[256] = {
NULL,
NULL,
NULL,
"\\/",
NULL,
NULL,
NULL,
NULL,
Expand Down

0 comments on commit c3f0490

Please sign in to comment.