torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix formatting in tor_assertf() message in struct_check_magic().

Browse Source 
Closes 32771; bugfix on 0.4.2.1-alpha.
This commit is contained in:
Nick Mathewson
2019-12-16 15:31:23 -05:00
parent df5c81fec0
commit b4977d1aa9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug32771
+4
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.
src/lib/confmgt/structvar.c
+2 -2
View File
@@ -53,8 +53,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl)
const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset);
tor_assertf(*ptr == decl->magic_val,
"Bad magic number on purported %s object. "
"Expected %"PRIu32"x but got "PRIu32"x.",
decl->magic_val, *ptr);
"Expected %"PRIu32"x but got %"PRIu32"x.",
decl->typename, decl->magic_val, *ptr);
}
/**