diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-25 14:54:24 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-25 14:54:40 +0200 |
commit | c3f0490a0687c7d2d5c45a8f448ebdc640629a1b (patch) | |
tree | 5ce7053cc75fd9ebd7fcd83aa7d6d0371667b97c | |
parent | 91389e51c78ae3565b037e31dd5382b52bd75136 (diff) | |
parent | 77aeb7c964b66075aeddeb6542b53bdc0f96538c (diff) | |
download | bitcoin-c3f0490a0687c7d2d5c45a8f448ebdc640629a1b.tar.xz |
Merge pull request #6339
77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
-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, |