From d9da8f6860cb61607f64eee070be6cd84ca2fe65 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 9 Jan 2017 12:18:58 -0800 Subject: [PATCH] bin/socks5-server.py: convert address from bytes to str (bug 604474) --- bin/socks5-server.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/socks5-server.py b/bin/socks5-server.py index cfe3ece..bd9687f 100644 --- a/bin/socks5-server.py +++ b/bin/socks5-server.py @@ -83,6 +83,11 @@ class Socks5Server(object): data = yield from reader.readexactly(1) addr_len, = struct.unpack('!B', data) addr = yield from reader.readexactly(addr_len) + try: + addr = addr.decode('utf_8') + except UnicodeDecodeError: + rpl = 0x04 # host unreachable + elif atyp == 0x04: # IPv6 data = yield from reader.readexactly(16) addr = socket.inet_ntop(socket.AF_INET6, data) -- 2.7.4