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: Improve robustness against invalid data.

---
 libmproxy/proxy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libmproxy/proxy.py')

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 5a2a4f43..f0640f23 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:
-- 
cgit v1.2.3