瀏覽代碼

Add another safe_str_client to fix bug 17419

Nick Mathewson 8 年之前
父節點
當前提交
3074b8365f
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 4 0
      changes/bug17419
  2. 1 1
      src/or/buffers.c

+ 4 - 0
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.

+ 1 - 1
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) {