diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-01-30 13:48:36 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-01-30 13:48:36 -0500 |
| commit | a1dec44723b4c2b38140b49efd0d30bb784626ae (patch) | |
| tree | 397206c6c48fe4b4f669ea2ed89b49c503f24f3c | |
| parent | 9662a13d7e587ec9b78af77cdb6607b4ad23a918 (diff) | |
| parent | 2a1f8ea2e78486966c71762ebc3286f2b3e531ff (diff) | |
| download | tor-a1dec44723b4c2b38140b49efd0d30bb784626ae.tar.gz tor-a1dec44723b4c2b38140b49efd0d30bb784626ae.zip | |
Merge branch 'tor-github/pr/1697'
| -rw-r--r-- | changes/bug33095_041 | 5 | ||||
| -rw-r--r-- | src/lib/log/util_bug.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug33095_041 b/changes/bug33095_041 new file mode 100644 index 0000000000..7d1f04e279 --- /dev/null +++ b/changes/bug33095_041 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, bug reporting): + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to do + so. Previously we would say this whenever a BUG() check failed in + the code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index f1831fd25b..ae3d125a08 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -198,7 +198,7 @@ STMT_END #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ - (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",1,NULL),1) \ + (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0,NULL),1) \ : 0) #endif /* defined(ALL_BUGS_ARE_FATAL) || ... */ |