nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2'

Browse Source
This commit is contained in:
Nick Mathewson 2020-01-06 13:24:01 -05:00
commit 48f7341783
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug32771 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging, crash):
- Avoid a possible crash when trying to log a (fatal) assertion failure
about mismatched magic numbers in configuration objects. Fixes bug 32771;
bugfix on 0.4.2.1-alpha.

4
changes/ticket32765 Normal file
View File

@ -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.

4
src/lib/confmgt/structvar.c
View File

@ -71,8 +71,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl)
const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset);
tor_assertf(*ptr == decl->magic_val, tor_assertf(*ptr == decl->magic_val,
"Bad magic number on purported %s object. " "Bad magic number on purported %s object. "
"Expected %"PRIu32"x but got "PRIu32"x.", "Expected %"PRIu32"x but got %"PRIu32"x.",
decl->magic_val, *ptr); decl->typename, decl->magic_val, *ptr);
} }
/** /**

6
src/lib/log/util_bug.h
View File

@ -247,10 +247,12 @@
void tor_assertion_failed_(const char *fname, unsigned int line, void tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr, 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, void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr, 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; void tor_abort_(void) ATTR_NORETURN;