nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix assertf() issues when ALL_BUGS_ARE_FATAL is defined.

Browse Source 
Fix from Gisle Vanem; fixes bug 30179.  Bug not in any released
version of Tor.
This commit is contained in:
Nick Mathewson 2019-04-15 14:37:46 -04:00
parent 358df18064
commit 3105081c2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/log/util_bug.h
View File

@ -143,12 +143,13 @@
#ifdef ALL_BUGS_ARE_FATAL #ifdef ALL_BUGS_ARE_FATAL
#define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal_unreached() tor_assert(0)
#define tor_assert_nonfatal(cond) tor_assert((cond)) #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_unreached_once() tor_assert(0)
#define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define tor_assert_nonfatal_once(cond) tor_assert((cond))
#define BUG(cond) \ #define BUG(cond) \
(ASSERT_PREDICT_UNLIKELY_(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) \ tor_abort_(), 1) \
: 0) : 0)
#elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS)