Merge branch 'maint-0.2.9' into maint-0.3.0
This commit is contained in:
commit
18734d3b25
|
@ -0,0 +1,7 @@
|
|||
o Minor bugfixes (coverity builds):
|
||||
- Avoid Coverity build warnings related to our BUG() macro. By
|
||||
default, Coverity treats BUG() as the Linux kernel does: an
|
||||
instant abort(). We need to override that so our BUG() macro
|
||||
doesn't prevent Coverity from analyzing functions that use it.
|
||||
Fixes bug 23030; bugfix on 0.2.9.1-alpha.
|
||||
|
|
@ -58,6 +58,19 @@
|
|||
* return -1;
|
||||
*/
|
||||
|
||||
#ifdef __COVERITY__
|
||||
#undef BUG
|
||||
// Coverity defines this in global headers; let's override it. This is a
|
||||
// magic coverity-only preprocessor thing.
|
||||
#nodef BUG(x) ((x)?(__coverity_panic__(),1):0)
|
||||
#endif
|
||||
|
||||
#if defined(__COVERITY__) || defined(__clang_analyzer__)
|
||||
// We're running with a static analysis tool: let's treat even nonfatal
|
||||
// assertion failures as something that we need to avoid.
|
||||
#define ALL_BUGS_ARE_FATAL
|
||||
#endif
|
||||
|
||||
#ifdef ALL_BUGS_ARE_FATAL
|
||||
#define tor_assert_nonfatal_unreached() tor_assert(0)
|
||||
#define tor_assert_nonfatal(cond) tor_assert((cond))
|
||||
|
|
Loading…
Reference in New Issue