[tor-commits] [tor/release-0.2.5] Use safe_str in channel_dumpstats: improve 12184 diagnostic

[arma at torproject.org]

commit 486bd4fae706a1493ee34c3b72d9097d835c6a09
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 18 21:20:44 2014 +0200

    Use safe_str in channel_dumpstats: improve 12184 diagnostic
---
 src/or/channel.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c
index 1cc7864..964b3fc 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 {