Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add general LeakSanitizer macros/instrumentation

Browse source
This commit is contained in:
Jon Siwek 2019-12-19 18:42:49 -08:00
parent 4735165d31
commit 447c3712cf
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.cc
View file

@ -308,6 +308,8 @@ void done_with_network()
abort(); abort();
} }
#endif #endif
ZEEK_LSAN_DISABLE();
} }
void terminate_bro() void terminate_bro()
@ -406,6 +408,7 @@ static void bro_new_handler()
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
ZEEK_LSAN_DISABLE();
std::set_new_handler(bro_new_handler); std::set_new_handler(bro_new_handler);
// When running unit tests, the first argument on the command line must be // When running unit tests, the first argument on the command line must be
@ -1052,6 +1055,13 @@ int main(int argc, char** argv)
reporter->Warning("event handler never invoked: %s", handler.c_str()); reporter->Warning("event handler never invoked: %s", handler.c_str());
} }
// Enable LeakSanitizer before zeek_init() and even before executing
// top-level statements. Even though it's not bad if a leak happens only
// once at initialization, we have to assume that script-layer code causing
// such a leak can be placed in any arbitrary event handler and potentially
// cause more severe problems.
ZEEK_LSAN_ENABLE();
if ( stmts ) if ( stmts )
{ {
stmt_flow_type flow; stmt_flow_type flow;

26
zeek-config.h.in
View file

@ -243,3 +243,29 @@ extern const char* BRO_VERSION_FUNCTION();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
// GCC uses __SANITIZE_ADDRESS__, Clang uses __has_feature
#if defined(__SANITIZE_ADDRESS__)
#define ZEEK_ASAN
#endif
#if defined(__has_feature)
#if __has_feature(address_sanitizer)
#define ZEEK_ASAN
#endif
#endif
#if defined(ZEEK_ASAN)
#include <sanitizer/lsan_interface.h>
#define ZEEK_LSAN_CHECK(x) __lsan_do_leak_check(x)
#define ZEEK_LSAN_ENABLE(x) __lsan_enable(x)
#define ZEEK_LSAN_IGNORE(x) __lsan_ignore_object(x)
#define ZEEK_LSAN_DISABLE(x) __lsan_disable(x)
#define ZEEK_LSAN_DISABLE_SCOPE(x) __lsan::ScopedDisabler x
#else
#define ZEEK_LSAN_CHECK(x)
#define ZEEK_LSAN_ENABLE(x)
#define ZEEK_LSAN_IGNORE(x)
#define ZEEK_LSAN_DISABLE(x)
#define ZEEK_LSAN_DISABLE_SCOPE(x)
#endif