diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-29 13:48:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-29 13:48:25 -0400 |
| commit | 0575a182a633429e755dc4366eced76656461d9b (patch) | |
| tree | cf88f1492fbdcf320cd62f9bd168eb1bfd3338dd | |
| parent | 216456299f5ce83aabef8dd7cb80f2b3d8acd484 (diff) | |
| parent | 2a1f8ea2e78486966c71762ebc3286f2b3e531ff (diff) | |
| download | tor-0575a182a633429e755dc4366eced76656461d9b.tar.gz tor-0575a182a633429e755dc4366eced76656461d9b.zip | |
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
| -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 030bfa2cc9..7eaa6173c8 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -196,7 +196,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) || ... */ |