nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Even more diagnostic messages for bug 28223.

Browse Source 
Use TOR_PRIuSZ in place of %zu.
This commit is contained in:
Nick Mathewson 2019-04-15 15:21:18 -04:00
parent 821d29e420
commit 0c42ddf28c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/feature/nodelist/microdesc.c
View File

@ -224,7 +224,8 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out)
const char *nulpos = memchr(md->body, 0, md->bodylen); const char *nulpos = memchr(md->body, 0, md->bodylen);
if (BUG(nulpos)) { if (BUG(nulpos)) {
log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. " log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. "
"offset %"PRId64", bodylen %zu, nul position %zu", "offset %"PRId64", bodylen %"TOR_PRIuSZ", "
"nul position %"TOR_PRIuSZ".",
(int64_t)md->off, md->bodylen, (int64_t)md->off, md->bodylen,
(size_t)(nulpos - md->body)); (size_t)(nulpos - md->body));
} }
@ -493,7 +494,7 @@ warn_if_nul_found(const char *inp, size_t len, const char *description)
const char *nul_found = memchr(inp, 0, len); const char *nul_found = memchr(inp, 0, len);
if (BUG(nul_found)) { if (BUG(nul_found)) {
log_warn(LD_BUG, "Found unexpected NUL while reading %s, at " log_warn(LD_BUG, "Found unexpected NUL while reading %s, at "
"position %zu/%zu.", "position %"TOR_PRIuSZ"/%"TOR_PRIuSZ".",
description, (nul_found - inp), len); description, (nul_found - inp), len);
} }
} }