commit 3074b8365fe5c76e6fc0b9597a99ab2671c7e939 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 12 10:42:01 2016 -0500
Add another safe_str_client to fix bug 17419 --- changes/bug17419 | 4 ++++ src/or/buffers.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug17419 b/changes/bug17419 new file mode 100644 index 0000000..8ad8edd --- /dev/null +++ b/changes/bug17419 @@ -0,0 +1,4 @@ + + o Minor bugfixes: + - When logging a malformed hostname received through socks4, scrub it + if SafeLogging says we should. Fixes bug 17419; bugfix on 0.1.1.16-rc. diff --git a/src/or/buffers.c b/src/or/buffers.c index 4696bec..cdb499b 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1945,7 +1945,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, log_warn(LD_PROTOCOL, "Your application (using socks4 to port %d) gave Tor " "a malformed hostname: %s. Rejecting the connection.", - req->port, escaped(req->address)); + req->port, escaped_safe_str_client(req->address)); return -1; } if (authend != authstart) {