diff options
| author | Daniel Kraft <d@domob.eu> | 2015-06-10 14:57:57 +0200 |
|---|---|---|
| committer | Daniel Kraft <d@domob.eu> | 2015-06-11 12:09:05 +0200 |
| commit | 0cc7b2352e749a7863d7b5ed680e3fb5f04f9511 (patch) | |
| tree | 613e4d563b3f7f7590b45621da797536d77c04c3 /src/univalue | |
| parent | 51870fc1512157de3b3b9640a9332afb7e2c3aa4 (diff) | |
| download | bitcoin-0cc7b2352e749a7863d7b5ed680e3fb5f04f9511.tar.xz | |
Fix univalue handling of \u0000 characters.
Univalue's parsing of \u escape sequences did not handle NUL characters
correctly. They were, effectively, dropped. The extended test-case
fails with the old code, and is fixed with this patch.
Diffstat (limited to 'src/univalue')
| -rw-r--r-- | src/univalue/univalue_read.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/univalue/univalue_read.cpp b/src/univalue/univalue_read.cpp index 5cea778996..261771811d 100644 --- a/src/univalue/univalue_read.cpp +++ b/src/univalue/univalue_read.cpp @@ -188,25 +188,22 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed, case 't': valStr += "\t"; break; case 'u': { - char buf[4] = {0,0,0,0}; - char *last = &buf[0]; unsigned int codepoint; if (hatoui(raw + 1, raw + 1 + 4, codepoint) != raw + 1 + 4) return JTOK_ERR; if (codepoint <= 0x7f) - *last = (char)codepoint; + valStr.push_back((char)codepoint); else if (codepoint <= 0x7FF) { - *last++ = (char)(0xC0 | (codepoint >> 6)); - *last = (char)(0x80 | (codepoint & 0x3F)); + valStr.push_back((char)(0xC0 | (codepoint >> 6))); + valStr.push_back((char)(0x80 | (codepoint & 0x3F))); } else if (codepoint <= 0xFFFF) { - *last++ = (char)(0xE0 | (codepoint >> 12)); - *last++ = (char)(0x80 | ((codepoint >> 6) & 0x3F)); - *last = (char)(0x80 | (codepoint & 0x3F)); + valStr.push_back((char)(0xE0 | (codepoint >> 12))); + valStr.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F))); + valStr.push_back((char)(0x80 | (codepoint & 0x3F))); } - valStr += buf; raw += 4; break; } |