LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #6266

Browse source 
0cc7b23 Fix univalue handling of \u0000 characters. (Daniel Kraft)
This commit is contained in:
Wladimir J. van der Laan 2015-06-12 09:13:55 +02:00
commit ebab5d3c59
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]"; "[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]";
BOOST_AUTO_TEST_CASE(univalue_readwrite) BOOST_AUTO_TEST_CASE(univalue_readwrite)
{ {
@ -306,7 +306,9 @@ BOOST_AUTO_TEST_CASE(univalue_readwrite)
BOOST_CHECK_EQUAL(obj.size(), 3); BOOST_CHECK_EQUAL(obj.size(), 3);
BOOST_CHECK(obj["key1"].isStr()); BOOST_CHECK(obj["key1"].isStr());
BOOST_CHECK_EQUAL(obj["key1"].getValStr(), "str"); std::string correctValue("str");
correctValue.push_back('\0');
BOOST_CHECK_EQUAL(obj["key1"].getValStr(), correctValue);
BOOST_CHECK(obj["key2"].isNum()); BOOST_CHECK(obj["key2"].isNum());
BOOST_CHECK_EQUAL(obj["key2"].getValStr(), "800"); BOOST_CHECK_EQUAL(obj["key2"].getValStr(), "800");
BOOST_CHECK(obj["key3"].isObject()); BOOST_CHECK(obj["key3"].isObject());

15
src/univalue/univalue_read.cpp
View file

@ -188,25 +188,22 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
case 't': valStr += "\t"; break; case 't': valStr += "\t"; break;
case 'u': { case 'u': {
char buf[4] = {0,0,0,0};
char *last = &buf[0];
unsigned int codepoint; unsigned int codepoint;
if (hatoui(raw + 1, raw + 1 + 4, codepoint) != if (hatoui(raw + 1, raw + 1 + 4, codepoint) !=
raw + 1 + 4) raw + 1 + 4)
return JTOK_ERR; return JTOK_ERR;
if (codepoint <= 0x7f) if (codepoint <= 0x7f)
*last = (char)codepoint; valStr.push_back((char)codepoint);
else if (codepoint <= 0x7FF) { else if (codepoint <= 0x7FF) {
*last++ = (char)(0xC0 | (codepoint >> 6)); valStr.push_back((char)(0xC0 | (codepoint >> 6)));
*last = (char)(0x80 | (codepoint & 0x3F)); valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
} else if (codepoint <= 0xFFFF) { } else if (codepoint <= 0xFFFF) {
*last++ = (char)(0xE0 | (codepoint >> 12)); valStr.push_back((char)(0xE0 | (codepoint >> 12)));
*last++ = (char)(0x80 | ((codepoint >> 6) & 0x3F)); valStr.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
*last = (char)(0x80 | (codepoint & 0x3F)); valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
} }
valStr += buf;
raw += 4; raw += 4;
break; break;
} }