From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 4 Jun 2017 11:22:45 +0000 (+0200)
Subject: Use string_is_valid_hostname in SOCKS4 request parsing codepath
X-Git-Tag: tor-0.3.2.1-alpha~308^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8c98759e56d9af14c1046dc629d6f03330ac031;p=thirdparty%2Ftor.git

Use string_is_valid_hostname in SOCKS4 request parsing codepath
---

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 399b591d1c..1907d69cfb 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1806,7 +1806,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
       log_debug(LD_APP,"socks4: Everything is here. Success.");
       strlcpy(req->address, startaddr ? startaddr : tmpbuf,
               sizeof(req->address));
-      if (!tor_strisprint(req->address) || strchr(req->address,'\"')) {
+      if (!string_is_valid_hostname(req->address)) {
         log_warn(LD_PROTOCOL,
                  "Your application (using socks4 to port %d) gave Tor "
                  "a malformed hostname: %s. Rejecting the connection.",