aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-07-03 22:55:02 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-07-03 22:55:02 +1200
commitfe86194cc24039bd3efe1719f19edc1f2a41034f (patch)
tree7e893fc0e15313c6ca6fa5d6ba926e477453dc69 /libmproxy/proxy.py
parent9c30e2e86d162e664d4b987479bd59155c712ec7 (diff)
downloadmitmproxy-fe86194cc24039bd3efe1719f19edc1f2a41034f.tar.gz
mitmproxy-fe86194cc24039bd3efe1719f19edc1f2a41034f.tar.bz2
mitmproxy-fe86194cc24039bd3efe1719f19edc1f2a41034f.zip
Fix Python coredump (!!) on SNI IDNA decoding.
Diffstat (limited to 'libmproxy/proxy.py')
-rw-r--r--libmproxy/proxy.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 2294a894..f94171f0 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -255,7 +255,9 @@ class ProxyHandler(tcp.BaseHandler):
return line
def handle_sni(self, conn):
- self.sni = conn.get_servername().decode("utf8").encode("idna")
+ sn = conn.get_servername()
+ if sn:
+ self.sni = sn.decode("utf8").encode("idna")
def read_request(self, client_conn):
if self.config.transparent_proxy: