diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2015-12-02 12:26:24 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2015-12-02 12:26:24 +0100 |
| commit | 982709199f1b4e9e35211c419a81938f9f1dd4ed (patch) | |
| tree | 6abb4a6467fde2b738dfa8acf32fef55257130c2 /lib/univalue_write.cpp | |
| parent | 313e7f5c89d6e72e06efe9255089765b4c5815fe (diff) | |
Squashed 'src/univalue/' changes from 5839ac3..2740c4f
2740c4f Merge branch '2015_11_escape_plan' into bitcoin
7482163 Add new testcase to Makefile.am
46098ee Version 1.0.1.
ccf3575 parser: Ensure multiple values cannot follow each other
eb6cd64 Omit Obj/Arr open token from jsonTokenIsValue() test
bfef9e2 Makefile.am: list recently added test data, fail{35,36}.json
3e319f3 parser: Tighten array, object syntax checks.
c74185c parser: transform C++ variables into bitmask
f2568bc Prefer C++ STL vector .at() for accessing object values.
8eafa26 travis: run parallel 'make distcheck'
fd448da test: Improve tester diagnostics. Add failing test case from #15
2158205 Use internal, locale-independent isspace(), isdigit() implementations.
2ab9ad4 travis: Make 'make distcheck' for more comprehensive checks.
3339191 Escape all control characters
git-subtree-dir: src/univalue
git-subtree-split: 2740c4f71242086a7eb3dc32f812546ba9fad913
Diffstat (limited to 'lib/univalue_write.cpp')
| -rw-r--r-- | lib/univalue_write.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/univalue_write.cpp b/lib/univalue_write.cpp index bce3997af7..ceb4cc9166 100644 --- a/lib/univalue_write.cpp +++ b/lib/univalue_write.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <ctype.h> #include <iomanip> #include <sstream> #include <stdio.h> @@ -25,10 +24,10 @@ static string json_escape(const string& inS) if (escStr) outS += escStr; - else if (isprint(ch)) + else if (ch < 0x80) outS += ch; - else { + else { // TODO handle UTF-8 properly char tmpesc[16]; sprintf(tmpesc, "\\u%04x", ch); outS += tmpesc; @@ -113,7 +112,7 @@ void UniValue::writeObject(unsigned int prettyIndent, unsigned int indentLevel, s += "\"" + json_escape(keys[i]) + "\":"; if (prettyIndent) s += " "; - s += values[i].write(prettyIndent, indentLevel + 1); + s += values.at(i).write(prettyIndent, indentLevel + 1); if (i != (values.size() - 1)) s += ","; if (prettyIndent) |