aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-16 15:27:18 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-16 15:27:18 -0500
commitdf5c81fec0f25a684f1f7e68e80abcde5402d3ef (patch)
treee0dd0edd798a781ed461e8fbb549b9357498223b
parentbd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 (diff)
parent1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5 (diff)
downloadtor-df5c81fec0f25a684f1f7e68e80abcde5402d3ef.tar.gz
tor-df5c81fec0f25a684f1f7e68e80abcde5402d3ef.zip
Merge branch 'bug32765_041' into bug32771_042
-rw-r--r--changes/ticket327654
-rw-r--r--src/lib/log/util_bug.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/ticket32765 b/changes/ticket32765
new file mode 100644
index 0000000000..a9663a5df3
--- /dev/null
+++ b/changes/ticket32765
@@ -0,0 +1,4 @@
+ o Minor bugfixes (correctness checks):
+ - Use GCC/Clang's printf-checking feature to make sure that
+ tor_assertf() arguments are correctly typed. Fixes bug 32765;
+ bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index c3141754de..030bfa2cc9 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -242,10 +242,12 @@
void tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr,
- const char *fmt, ...);
+ const char *fmt, ...)
+ CHECK_PRINTF(5,6);
void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr,
- int once, const char *fmt, ...);
+ int once, const char *fmt, ...)
+ CHECK_PRINTF(6,7);
void tor_abort_(void) ATTR_NORETURN;