fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-10-28 20:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix overflow check

Browse Source
This commit is contained in:
Victor Zverovich
2017-11-12 06:58:11 -08:00
parent 686ff942af
commit 18a0b94b0e
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/format-test.cc
View File

@@ -1821,7 +1821,15 @@ TEST(FormatTest, UdlTemplate) {
struct test_error_handler {
const char *&error;
constexpr void on_error(const char *message) { error = message; }
constexpr test_error_handler(const char *&err): error(err) {}
constexpr test_error_handler(const test_error_handler &other)
: error(other.error) {}
constexpr void on_error(const char *message) {
if (!error)
error = message;
}
};
constexpr size_t len(const char *s) {
@@ -1831,7 +1839,7 @@ constexpr size_t len(const char *s) {
return len;
}
constexpr bool eq(const char *s1, const char *s2) {
constexpr bool equal(const char *s1, const char *s2) {
if (!s1 && !s2)
return true;
while (*s1 && *s1 == *s2) {
@@ -1848,7 +1856,7 @@ constexpr bool test_error(const char *fmt, const char *expected_error) {
using ref = std::reference_wrapper<test_error_handler>;
fmt::internal::check_format_string<char, test_error_handler, Args...>(
string_view(fmt, len(fmt)), eh);
return eq(actual_error, expected_error);
return equal(actual_error, expected_error);
}
#define EXPECT_ERROR(fmt, error, ...) \
@@ -1860,4 +1868,5 @@ TEST(FormatTest, FormatStringErrors) {
EXPECT_ERROR("{0:s", "unknown format specifier", Date);
EXPECT_ERROR("{0:=5", "unknown format specifier", char);
EXPECT_ERROR("{foo", "missing '}' in format string", int);
EXPECT_ERROR("{10000000000}", "number is too big");
}

15
test/util-test.cc
View File

@@ -838,3 +838,18 @@ TEST(UtilTest, IsEnumConvertibleToInt) {
EXPECT_TRUE(fmt::internal::convert_to_int<TestEnum>::enable_conversion);
}
#endif
TEST(UtilTest, ParseNonnegativeInt) {
if (std::numeric_limits<int>::max() != (1 << 31)) {
fmt::print("Skipping parse_nonnegative_int test\n");
return;
}
const char *s = "10000000000";
EXPECT_THROW_MSG(
parse_nonnegative_int(s, fmt::internal::error_handler()),
fmt::format_error, "number is too big");
s = "2147483649";
EXPECT_THROW_MSG(
parse_nonnegative_int(s, fmt::internal::error_handler()),
fmt::format_error, "number is too big");
}