diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-12-16 15:31:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-12-16 15:31:23 -0500 |
| commit | b4977d1aa9366cdb1475664bcf1486fbfdf5a166 (patch) | |
| tree | 96403332d686e21ccdb017e7b9aa089b5773e10c | |
| parent | df5c81fec0f25a684f1f7e68e80abcde5402d3ef (diff) | |
| download | tor-b4977d1aa9366cdb1475664bcf1486fbfdf5a166.tar.gz tor-b4977d1aa9366cdb1475664bcf1486fbfdf5a166.zip | |
Fix formatting in tor_assertf() message in struct_check_magic().
Closes 32771; bugfix on 0.4.2.1-alpha.
| -rw-r--r-- | changes/bug32771 | 4 | ||||
| -rw-r--r-- | src/lib/confmgt/structvar.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug32771 b/changes/bug32771 new file mode 100644 index 0000000000..606bcf4be4 --- /dev/null +++ b/changes/bug32771 @@ -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. diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c8..7a3b8c7df2 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -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); } /** |