From fe86194cc24039bd3efe1719f19edc1f2a41034f Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 3 Jul 2012 22:55:02 +1200
Subject: Fix Python coredump (!!) on SNI IDNA decoding.

---
 libmproxy/proxy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libmproxy/proxy.py')

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:
-- 
cgit v1.2.3