From: John Brooks <special@torproject.org>
Date: Mon, 21 Mar 2016 12:22:14 +0000 (+0700)
Subject: Scrub service name in introduction circuit warning
X-Git-Tag: tor-0.2.8.2-alpha~58^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c057c2833ff2ab0779cbd1e5f3747be0a232126;p=thirdparty%2Ftor.git

Scrub service name in introduction circuit warning

Fixes bug 18600.
---

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 09b20e34a4..39e5831589 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2717,7 +2717,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit)
                 circuit->rend_data->rend_pk_digest);
   if (!service) {
     log_warn(LD_REND, "Unrecognized service ID %s on introduction circuit %u.",
-             serviceid, (unsigned)circuit->base_.n_circ_id);
+             safe_str_client(serviceid), (unsigned)circuit->base_.n_circ_id);
     reason = END_CIRC_REASON_NOSUCHSERVICE;
     goto err;
   }