summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-07-18 21:20:44 +0200
committerNick Mathewson <nickm@torproject.org>2014-07-18 21:20:44 +0200
commit486bd4fae706a1493ee34c3b72d9097d835c6a09 (patch)
treef15146013c4757934a82770998b5dc191cf1ba2f
parentf6a776d91565a88bd430152cc38c0a2019aac33b (diff)
downloadtor-486bd4fae706a1493ee34c3b72d9097d835c6a09.tar.gz
tor-486bd4fae706a1493ee34c3b72d9097d835c6a09.zip
Use safe_str in channel_dumpstats: improve 12184 diagnostic
-rw-r--r--src/or/channel.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/channel.c b/src/or/channel.c
index 1cc786487a..964b3fcac3 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -19,6 +19,7 @@
#include "circuitbuild.h"
#include "circuitlist.h"
#include "circuitstats.h"
+#include "config.h"
#include "connection_or.h" /* For var_cell_free() */
#include "circuitmux.h"
#include "entrynodes.h"
@@ -3277,9 +3278,9 @@ channel_dump_statistics(channel_t *chan, int severity)
" is %s, and gives a canonical description of \"%s\" and an "
"actual description of \"%s\"",
U64_PRINTF_ARG(chan->global_identifier),
- remote_addr_str,
- channel_get_canonical_remote_descr(chan),
- actual);
+ safe_str(remote_addr_str),
+ safe_str(channel_get_canonical_remote_descr(chan)),
+ safe_str(actual));
tor_free(remote_addr_str);
tor_free(actual);
} else {