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

Merge remote-tracking branch 'origin/topic/jsiwek/freebsd-lsan-disable'

Browse source 
* origin/topic/jsiwek/freebsd-lsan-disable:
  Prevent use of LeakSanitizer on FreeBSD
This commit is contained in:
Tim Wojtulewicz 2021-03-17 13:48:34 -07:00
commit 9fc8f491ff
6 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4.1.0-dev.330 | 2021-03-17 13:48:34 -0700
* Prevent use of LeakSanitizer on FreeBSD (Jon Siwek, Corelight)
4.1.0-dev.328 | 2021-03-17 10:35:59 -0700
* Add tests for ERSPAN Type I patch

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.328
4.1.0-dev.330

2
auxil/bifcl

@ -1 +1 @@
Subproject commit d356e4716ef22e6175fe5dd4f3c49b8c4c892214
Subproject commit 919416a0a3457c95f23b67b39ce8e4da0b84c00b

2
auxil/binpac

@ -1 +1 @@
Subproject commit daaecd4c76317b91d625f4919f7f104e9e6d76fa
Subproject commit f946ef50de1896df07adafd879c360ef29bea965

2
auxil/broker

@ -1 +1 @@
Subproject commit c6779fb4dc5a636eb75e14f6306548bbc0386767
Subproject commit 7810ec9936d1aa65c7c7d21b87e43c7d67481da0

3
zeek-config.h.in
View file

@ -260,7 +260,8 @@ extern const char* BRO_VERSION_FUNCTION();
#endif
#endif
#if defined(ZEEK_ASAN)
// FreeBSD doesn't support LeakSanitizer
#if defined(ZEEK_ASAN) && !defined(__FreeBSD__)
#include <sanitizer/lsan_interface.h>
#define ZEEK_LSAN_CHECK(x) __lsan_do_leak_check(x)
#define ZEEK_LSAN_ENABLE(x) __lsan_enable(x)