RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[tests] Correctly process empty strings in to_whatever

Browse source
This commit is contained in:
Ilya Zverev 2016-06-01 14:45:20 +03:00
parent 4fca9a22bd
commit f334f5b6a6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
base/base_tests/string_utils_test.cpp
View file

@ -238,6 +238,9 @@ UNIT_TEST(to_uint64)
uint64_t i;
string s;
s = "";
TEST(!strings::to_uint64(s, i), ());
s = "0";
TEST(strings::to_uint64(s, i), ());
TEST_EQUAL(0, i, ());

6
base/string_utils.cpp
View file

@ -46,7 +46,7 @@ namespace
template <typename T, typename TResult>
bool IntegerCheck(char const * start, char const * stop, T x, TResult & out)
{
if (errno != EINVAL && *stop == 0)
if (errno != EINVAL && *stop == 0 && start != stop)
{
out = static_cast<TResult>(x);
return static_cast<T>(out) == x;
@ -80,7 +80,7 @@ bool to_uint64(char const * s, uint64_t & i)
#else
i = strtoull(s, &stop, 10);
#endif
return *stop == 0;
return *stop == 0 && s != stop;
}
bool to_int64(char const * s, int64_t & i)
@ -91,7 +91,7 @@ bool to_int64(char const * s, int64_t & i)
#else
i = strtoll(s, &stop, 10);
#endif
return *stop == 0;
return *stop == 0 && s != stop;
}
bool to_double(char const * s, double & d)