diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-15 10:48:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-15 10:48:35 -0400 |
| commit | 3462f8ed6430bdb1528a7b63aaf2281489eb04d1 (patch) | |
| tree | 643ef324c565c0caf5613c99b76ce6b6655a1e6b /src/common | |
| parent | fd528a0884e706f5ad10422d0c4501ce35254530 (diff) | |
| parent | 796e36e535d1713fd1168772669199ea9189ba61 (diff) | |
| download | tor-3462f8ed6430bdb1528a7b63aaf2281489eb04d1.tar.gz tor-3462f8ed6430bdb1528a7b63aaf2281489eb04d1.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/util_bug.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/common/util_bug.h b/src/common/util_bug.h index c274355f30..be0001e849 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -102,7 +102,12 @@ } STMT_END #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ -#define tor_assert_unreached() tor_assert(0) +#define tor_assert_unreached() \ + STMT_BEGIN { \ + tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \ + "line should be unreached"); \ + abort(); \ + } STMT_END /* Non-fatal bug assertions. The "unreached" variants mean "this line should * never be reached." The "once" variants mean "Don't log a warning more than |