nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6335

Browse Source 
0078ce7 wipeable_string: split - treat CR, LF and Tabs as separators (xiphon)
This commit is contained in:
luigi1111 2020-04-04 12:42:50 -05:00
commit 292e2d8f28
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/epee/src/wipeable_string.cpp
View File

@ -188,13 +188,14 @@ void wipeable_string::split(std::vector<wipeable_string> &fields) const
while (len--)
{
const char c = *ptr++;
if (c != ' ')
const bool space_prev = space;
space = std::isspace(c);
if (!space)
{
if (space)
if (space_prev)
fields.push_back({});
fields.back().push_back(c);
}
space = c == ' ';
}
}

1
tests/unit_tests/wipeable_string.cpp
View File

@ -182,6 +182,7 @@ TEST(wipeable_string, split)
ASSERT_TRUE(check_split(" foo bar baz ", {"foo", "bar", "baz"}));
ASSERT_TRUE(check_split(" foo bar baz", {"foo", "bar", "baz"}));
ASSERT_TRUE(check_split("foo bar baz ", {"foo", "bar", "baz"}));
ASSERT_TRUE(check_split("\tfoo\n bar\r\nbaz", {"foo", "bar", "baz"}));
}
TEST(wipeable_string, parse_hexstr)