Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4850

Browse Source 
b36353e2 unit_tests: add some hex parsing test for non hex input (xiphon)
6671110c unit_tests: add a test for parse_hexstr_to_binbuff (moneromooo-monero)
f6187cd8 epee: speed up parse_hexstr_to_binbuff a little (Howard Chu)
This commit is contained in:
Riccardo Spagni 2018-12-04 17:07:19 +02:00
commit 40650b43b8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
contrib/epee/include/string_tools.h
View File

@ -59,6 +59,26 @@
#pragma comment (lib, "Rpcrt4.lib") #pragma comment (lib, "Rpcrt4.lib")
#endif #endif
static const constexpr unsigned char isx[256] =
{
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 10, 11, 12, 13, 14, 15, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 10, 11, 12, 13, 14, 15, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
};
namespace epee namespace epee
{ {
namespace string_tools namespace string_tools
@ -98,30 +118,30 @@ namespace string_tools
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
template<class CharT> template<class CharT>
bool parse_hexstr_to_binbuff(const std::basic_string<CharT>& s, std::basic_string<CharT>& res, bool allow_partial_byte = false) bool parse_hexstr_to_binbuff(const std::basic_string<CharT>& s, std::basic_string<CharT>& res)
{ {
res.clear(); res.clear();
if (!allow_partial_byte && (s.size() & 1)) if (s.size() & 1)
return false; return false;
try try
{ {
long v = 0; res.resize(s.size() / 2);
for(size_t i = 0; i < (s.size() + 1) / 2; i++) unsigned char *dst = (unsigned char *)res.data();
const unsigned char *src = (const unsigned char *)s.data();
for(size_t i = 0; i < s.size(); i += 2)
{ {
CharT byte_str[3]; int tmp = *src++;
size_t copied = s.copy(byte_str, 2, 2 * i); tmp = isx[tmp];
byte_str[copied] = CharT(0); if (tmp == 0xff) return false;
CharT* endptr; int t2 = *src++;
v = strtoul(byte_str, &endptr, 16); t2 = isx[t2];
if (v < 0 || 0xFF < v || endptr != byte_str + copied) if (t2 == 0xff) return false;
{ *dst++ = (tmp << 4) | t2;
return false;
}
res.push_back(static_cast<unsigned char>(v));
} }
return true; return true;
}catch(...) }
catch(...)
{ {
return false; return false;
} }

29
tests/unit_tests/epee_utils.cpp
View File

@ -456,6 +456,35 @@ TEST(StringTools, PodToHex)
); );
} }
TEST(StringTools, ParseHex)
{
static const char data[] = "a10b68c2";
for (size_t i = 0; i < sizeof(data); i += 2)
{
std::string res;
ASSERT_TRUE(epee::string_tools::parse_hexstr_to_binbuff(std::string(data, i), res));
std::string hex = epee::string_tools::buff_to_hex_nodelimer(res);
ASSERT_EQ(hex.size(), i);
ASSERT_EQ(memcmp(data, hex.data(), i), 0);
}
}
TEST(StringTools, ParseNotHex)
{
std::string res;
for (size_t i = 0; i < 256; ++i)
{
std::string inputHexString = std::string(2, static_cast<char>(i));
if ((i >= '0' && i <= '9') || (i >= 'A' && i <= 'F') || (i >= 'a' && i <= 'f')) {
ASSERT_TRUE(epee::string_tools::parse_hexstr_to_binbuff(inputHexString, res));
} else {
ASSERT_FALSE(epee::string_tools::parse_hexstr_to_binbuff(inputHexString, res));
}
}
ASSERT_FALSE(epee::string_tools::parse_hexstr_to_binbuff(std::string("a"), res));
}
TEST(StringTools, GetIpString) TEST(StringTools, GetIpString)
{ {
EXPECT_EQ( EXPECT_EQ(