tor

commit 2aa441b88e089c9aa650f25dd1b109bf14bc451d
parent b3492d53c3f643a1e6b2e62bb8b2ad5bfa77213e
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri,  3 May 2019 13:11:03 -0400

Merge branch 'tor-github/pr/954'

Diffstat:
M
src/lib/log/util_bug.h
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git 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)