diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-12 10:42:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-12 10:42:01 -0500 |
| commit | 3074b8365fe5c76e6fc0b9597a99ab2671c7e939 (patch) | |
| tree | 144a4a3a57604585b7d5074858458dc9c9857e3e | |
| parent | 007eb3f8cbfbc696c301ef568a04a012fb847e10 (diff) | |
| download | tor-3074b8365fe5c76e6fc0b9597a99ab2671c7e939.tar.gz tor-3074b8365fe5c76e6fc0b9597a99ab2671c7e939.zip | |
Add another safe_str_client to fix bug 17419
| -rw-r--r-- | changes/bug17419 | 4 | ||||
| -rw-r--r-- | src/or/buffers.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug17419 b/changes/bug17419 new file mode 100644 index 0000000000..8ad8edd37b --- /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 4696bec8f4..cdb499b8da 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) { |