From d1ff52755007703cd2b7d12001091d5fea112245 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 4 Sep 2011 10:50:00 +1200
Subject: [PATCH 1/2] Reset exit flag when proxy starts.

---
 libmproxy/controller.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libmproxy/controller.py b/libmproxy/controller.py
index 756e51e61..67ce2460d 100644
--- a/libmproxy/controller.py
+++ b/libmproxy/controller.py
@@ -80,6 +80,8 @@ class Master:
         return changed
 
     def run(self):
+        global should_exit
+        should_exit = False
         if self.server:
             slave = Slave(self.masterq, self.server)
             slave.start()

From e5bded7deecb396bef33ebc0a5e345e4d8cf7928 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 5 Sep 2011 07:47:47 +1200
Subject: [PATCH 2/2] Improve robustness against invalid data.

---
 libmproxy/proxy.py | 6 ++++--
 libmproxy/utils.py | 7 +++++--
 test/test_utils.py | 3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 5a2a4f438..f0640f23b 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -104,7 +104,6 @@ def parse_request_line(request):
     return method, scheme, host, port, path, minor
     
 
-
 class FileLike:
     def __init__(self, o):
         self.o = o
@@ -197,7 +196,10 @@ class ServerConnection:
         if not len(parts) == 3:
             raise ProxyError(502, "Invalid server response: %s."%line)
         proto, code, msg = parts
-        code = int(code)
+        try:
+            code = int(code)
+        except ValueError:
+            raise ProxyError(502, "Invalid server response: %s."%line)
         headers = flow.Headers()
         headers.read(self.rfile)
         if code >= 100 and code <= 199:
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index ecf772637..37b751dc3 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -393,8 +393,11 @@ def parse_url(url):
     if not scheme:
         return None
     if ':' in netloc:
-        host, port = string.split(netloc, ':')
-        port = int(port)
+        host, port = string.rsplit(netloc, ':', maxsplit=1)
+        try:
+            port = int(port)
+        except ValueError:
+            return None
     else:
         host = netloc
         if scheme == "https":
diff --git a/test/test_utils.py b/test/test_utils.py
index 8b16e0570..129174441 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -216,6 +216,9 @@ class u_parse_url(libpry.AutoTree):
         s, h, po, pa = utils.parse_url("https://foo")
         assert po == 443
 
+        assert not utils.parse_url("https://foo:bar")
+        assert not utils.parse_url("https://foo:")
+
 tests = [
     uformat_timestamp(),
     uisBin(),