DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Address Daira's further comments

Browse Source
This commit is contained in:
Jack Grigg
2017-04-21 13:15:39 +12:00
parent 0b431fbdb5
commit d15cab21bc
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/torcontrol_tests.cpp
View File

@@ -163,6 +163,16 @@ BOOST_AUTO_TEST_CASE(util_ParseTorReplyMapping)
{"TwoOctal", "TwoEnd\11"}, {"TwoOctal", "TwoEnd\11"},
}); });
// Special handling for null case
// (needed because string comparison reads the null as end-of-string)
BOOST_TEST_MESSAGE(std::string("CheckParseTorReplyMapping(Null=\"\\0\")"));
auto ret = ParseTorReplyMapping("Null=\"\\0\"");
BOOST_CHECK_EQUAL(ret.size(), 1);
auto r_it = ret.begin();
BOOST_CHECK_EQUAL(r_it->first, "Null");
BOOST_CHECK_EQUAL(r_it->second.size(), 1);
BOOST_CHECK_EQUAL(r_it->second[0], '\0');
// A more complex valid grammar. PROTOCOLINFO accepts a VersionLine that // A more complex valid grammar. PROTOCOLINFO accepts a VersionLine that
// takes a key=value pair followed by an OptArguments, making this valid. // takes a key=value pair followed by an OptArguments, making this valid.
// Because an OptArguments contains no semantic data, there is no point in // Because an OptArguments contains no semantic data, there is no point in

2
src/torcontrol.cpp
View File

@@ -327,7 +327,7 @@ static std::map<std::string,std::string> ParseTorReplyMapping(const std::string
// Octal escape sequences have a limit of three octal digits, // Octal escape sequences have a limit of three octal digits,
// but terminate at the first character that is not a valid // but terminate at the first character that is not a valid
// octal digit if encountered sooner. // octal digit if encountered sooner.
for (j = 1; '0' <= value[i+j] && value[i+j] <= '7' && j < 3; ++j) {} for (j = 1; j < 3 && (i+j) < value.size() && '0' <= value[i+j] && value[i+j] <= '7'; ++j) {}
// Tor restricts first digit to 0-3 for three-digit octals. // Tor restricts first digit to 0-3 for three-digit octals.
if (j < 3 || ('0' <= value[i] && value[i] <= '3')) { if (j < 3 || ('0' <= value[i] && value[i] <= '3')) {
escaped_value.push_back(strtol(value.substr(i, j).c_str(), NULL, 8)); escaped_value.push_back(strtol(value.substr(i, j).c_str(), NULL, 8));