mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-25 06:21:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dangling else problem in FMT_ASSERT

Browse Source
This commit is contained in:
Victor Zverovich 2019-11-30 07:52:33 -08:00
parent fafb03fa6d
commit 6037b3cae9
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/core.h
View File

@ -231,8 +231,9 @@ void assert_fail(const char* file, int line, const char* message);
# define FMT_ASSERT(condition, message) # define FMT_ASSERT(condition, message)
# else # else
# define FMT_ASSERT(condition, message) \ # define FMT_ASSERT(condition, message) \
if (!(condition)) \ ((condition) \
fmt::internal::assert_fail(__FILE__, __LINE__, (message)) ? void() \
: fmt::internal::assert_fail(__FILE__, __LINE__, (message)))
# endif # endif
#endif #endif

11
test/assert-test.cc
View File

@ -20,3 +20,14 @@ TEST(AssertTest, Fail) {
EXPECT_DEBUG_DEATH_IF_SUPPORTED(FMT_ASSERT(false, "don't panic!"), EXPECT_DEBUG_DEATH_IF_SUPPORTED(FMT_ASSERT(false, "don't panic!"),
"don't panic!"); "don't panic!");
} }
bool test_condition = false;
TEST(AssertTest, DanglingElse) {
bool executed_else = false;
if (test_condition)
FMT_ASSERT(true, "");
else
executed_else = true;
EXPECT_TRUE(executed_else);
}