sek1ro/libbasen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(hex): str_size argument

Browse Source
This commit is contained in:
SEK1RO
2024-09-17 12:31:15 +03:00
parent 1993ee410d
commit 0c28595bbf
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/base/hex.hpp
View File

@ -7,7 +7,7 @@
namespace hex namespace hex
{ {
bool isValid(const char *str) noexcept; bool isValid(const char *str, size_t str_size) noexcept;
bool isValid(std::string_view str) noexcept; bool isValid(std::string_view str) noexcept;
void encode(const uint8_t *data, size_t data_size, char *str, size_t str_size); void encode(const uint8_t *data, size_t data_size, char *str, size_t str_size);

12
src/hex.cpp
View File

@ -27,9 +27,9 @@ static const int8_t hexmap[] = {
namespace hex namespace hex
{ {
bool isValid(const char *str) noexcept bool isValid(const char *str, size_t str_size) noexcept
{ {
return baseN::isValid(str, hexmap); return baseN::isValid(str, str_size, hexmap);
} }
bool isValid(std::string_view str) noexcept bool isValid(std::string_view str) noexcept
{ {
@ -55,10 +55,6 @@ namespace hex
} }
void decode(const char *str, size_t str_size, uint8_t *data, size_t data_size) void decode(const char *str, size_t str_size, uint8_t *data, size_t data_size)
{ {
if (!hex::isValid(str))
{
throw std::logic_error("hex::decode: out of digits map");
}
if (str_size % 2 != 0) if (str_size % 2 != 0)
{ {
throw std::logic_error("hex::decode: isn't hex"); throw std::logic_error("hex::decode: isn't hex");
@ -67,6 +63,10 @@ namespace hex
{ {
throw std::logic_error("hex::decode: not enough allocated length"); throw std::logic_error("hex::decode: not enough allocated length");
} }
if (!hex::isValid(str, str_size))
{
throw std::logic_error("hex::decode: out of digits map");
}
for (size_t i = 0; i * 2 < str_size; i++) for (size_t i = 0; i * 2 < str_size; i++)
{ {
data[i] = hexmap[(int8_t)str[i * 2]] << 4 | hexmap[(int8_t)str[i * 2 + 1]]; data[i] = hexmap[(int8_t)str[i * 2]] << 4 | hexmap[(int8_t)str[i * 2 + 1]];

8
test/test-hex.cpp
View File

@ -17,9 +17,9 @@ TEST(hex, encode)
EXPECT_STREQ(e.what(), "hex::encode: not enough allocated length"); EXPECT_STREQ(e.what(), "hex::encode: not enough allocated length");
} }
} }
TEST(hex, encode_1e6) TEST(hex, encode_1e7)
{ {
std::vector<uint8_t> data(1e6); std::vector<uint8_t> data(1e7);
encode(data); encode(data);
} }
TEST(hex, decode) TEST(hex, decode)
@ -36,9 +36,9 @@ TEST(hex, decode)
EXPECT_STREQ(e.what(), "hex::decode: isn't hex"); EXPECT_STREQ(e.what(), "hex::decode: isn't hex");
} }
} }
TEST(hex, decode_1e6) TEST(hex, decode_1e7)
{ {
std::string str(1e6, '0'); std::string str(1e7, '0');
decode(str); decode(str);
} }