diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-24 22:31:10 +0200 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-25 08:10:08 +0200 |
| commit | 77aeb7c964b66075aeddeb6542b53bdc0f96538c (patch) | |
| tree | 5ce7053cc75fd9ebd7fcd83aa7d6d0371667b97c | |
| parent | 91389e51c78ae3565b037e31dd5382b52bd75136 (diff) | |
UniValue: don't escape solidus, keep espacing of reverse solidus
| -rw-r--r-- | src/test/univalue_tests.cpp | 2 | ||||
| -rw-r--r-- | src/univalue/gen.cpp | 1 | ||||
| -rw-r--r-- | src/univalue/univalue_escapes.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp index 2c1d303f66..16bc8d30f6 100644 --- a/src/test/univalue_tests.cpp +++ b/src/test/univalue_tests.cpp @@ -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) { diff --git a/src/univalue/gen.cpp b/src/univalue/gen.cpp index abebe88634..5e5a4d4aed 100644 --- a/src/univalue/gen.cpp +++ b/src/univalue/gen.cpp @@ -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"; diff --git a/src/univalue/univalue_escapes.h b/src/univalue/univalue_escapes.h index 0514118285..4133b24ca1 100644 --- a/src/univalue/univalue_escapes.h +++ b/src/univalue/univalue_escapes.h @@ -49,7 +49,7 @@ static const char *escapes[256] = { NULL, NULL, NULL, - "\\/", + NULL, NULL, NULL, NULL, |