zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6339 

77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2015-06-25 14:54:24 +02:00
parent 91389e51c7 77aeb7c964
commit c3f0490a06
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/univalue_tests.cpp
View File

@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
} }
static const char *json1 = 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) BOOST_AUTO_TEST_CASE(univalue_readwrite)
{ {

1
src/univalue/gen.cpp
View File

@ -22,7 +22,6 @@ static void initJsonEscape()
{ {
escapes[(int)'"'] = "\\\""; escapes[(int)'"'] = "\\\"";
escapes[(int)'\\'] = "\\\\"; escapes[(int)'\\'] = "\\\\";
escapes[(int)'/'] = "\\/";
escapes[(int)'\b'] = "\\b"; escapes[(int)'\b'] = "\\b";
escapes[(int)'\f'] = "\\f"; escapes[(int)'\f'] = "\\f";
escapes[(int)'\n'] = "\\n"; escapes[(int)'\n'] = "\\n";

2
src/univalue/univalue_escapes.h
View File

@ -49,7 +49,7 @@ static const char *escapes[256] = {
NULL, NULL,
NULL, NULL,
NULL, NULL,
"\\/", NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL,