tor

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef
parent bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 16 Dec 2019 15:27:18 -0500

Merge branch 'bug32765_041' into bug32771_042

Diffstat:
A
changes/ticket32765
 | 
4
++++
M
src/lib/log/util_bug.h
 | 
6
++++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/ticket32765 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
@@ -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;