diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-15 14:37:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-15 14:37:46 -0400 |
| commit | 3105081c2f075409f182d497eb101e3a690bb2f7 (patch) | |
| tree | c3119ec510037912e1bc7d100506547dcda969d7 /src/lib/log | |
| parent | 358df18064d0389219e610cf9aa5b08bbd6a0ec8 (diff) | |
| download | tor-3105081c2f075409f182d497eb101e3a690bb2f7.tar.gz tor-3105081c2f075409f182d497eb101e3a690bb2f7.zip | |
Fix assertf() issues when ALL_BUGS_ARE_FATAL is defined.
Fix from Gisle Vanem; fixes bug 30179. Bug not in any released
version of Tor.
Diffstat (limited to 'src/lib/log')
| -rw-r--r-- | src/lib/log/util_bug.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 2e220b7286..fb223b35f4 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -143,12 +143,13 @@ #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond)) -#define tor_assertf_nonfatal(cond, fmt, ...) tor_assertf(cond, fmt, ...) +#define tor_assertf_nonfatal(cond, fmt, ...) \ + tor_assertf(cond, fmt, ##__VA_ARGS__) #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ - (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ + (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",NULL), \ tor_abort_(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) |