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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-1208-dict-asserts'

Browse source 
* origin/topic/jsiwek/gh-1208-dict-asserts:
  GH-1208: Use Dictionary validity assertions only during CI
This commit is contained in:
Jon Siwek 2020-10-13 16:26:24 -07:00
commit 92cc798dd5
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.cirrus.yml
View file

@ -161,6 +161,7 @@ sanitizer_task:
<< : *CI_TEMPLATE << : *CI_TEMPLATE
test_fuzzers_script: ./ci/test-fuzzers.sh test_fuzzers_script: ./ci/test-fuzzers.sh
env: env:
CXXFLAGS: -DZEEK_DICT_DEBUG
ZEEK_CI_CONFIGURE_FLAGS: *SANITIZER_CONFIG ZEEK_CI_CONFIGURE_FLAGS: *SANITIZER_CONFIG
ZEEK_TAILORED_UB_CHECKS: 1 ZEEK_TAILORED_UB_CHECKS: 1
UBSAN_OPTIONS: print_stacktrace=1 UBSAN_OPTIONS: print_stacktrace=1

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.422 | 2020-10-13 16:26:24 -0700
* GH-1208: Use Dictionary validity assertions only during CI (Jon Siwek, Corelight)
3.3.0-dev.420 | 2020-10-13 15:34:02 -0700 3.3.0-dev.420 | 2020-10-13 15:34:02 -0700
* Change "Cluster::Node$p" field to use "&default=0/unknown" (Seth Hall, Corelight) * Change "Cluster::Node$p" field to use "&default=0/unknown" (Seth Hall, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.420 3.3.0-dev.422

2
src/Dict.cc
View file

@ -17,7 +17,7 @@
#include "3rdparty/doctest.h" #include "3rdparty/doctest.h"
#ifdef DEBUG #if defined(DEBUG) && defined(ZEEK_DICT_DEBUG)
#define ASSERT_VALID(o) o->AssertValid() #define ASSERT_VALID(o) o->AssertValid()
#else #else
#define ASSERT_VALID(o) #define ASSERT_VALID(o)