diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-30 11:46:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-30 11:46:56 -0500 |
| commit | f2e4423bd2bf684849c968ff6bb19dfc3ee7d788 (patch) | |
| tree | 5cce9296b0c9c11532b08d28f7b511d37de36f7f /src/or/buffers.c | |
| parent | a4cf2ae24bf77c3c277a50b166fed0a09558d398 (diff) | |
| parent | d87d4183eee40d172eda5265feb0fddfe723dd06 (diff) | |
| download | tor-f2e4423bd2bf684849c968ff6bb19dfc3ee7d788.tar.gz tor-f2e4423bd2bf684849c968ff6bb19dfc3ee7d788.zip | |
Merge remote-tracking branch 'yawning/bug13315_fixup'
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 4cdc03bc03..f0d7e60794 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2063,9 +2063,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED); return -1; } - } - - if (!string_is_valid_hostname(req->address)) { + } else if (!string_is_valid_hostname(req->address)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_PROTOCOL, |