From e42136a6ef6f29a16cb2eb5f566be317ed7f3579 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 1 Jan 2013 11:24:11 +1300
Subject: Better error handling for transparent mode remote address resolution.

---
 libmproxy/platform/osx.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libmproxy/platform/osx.py')

diff --git a/libmproxy/platform/osx.py b/libmproxy/platform/osx.py
index d1c420e2..dda5d9af 100644
--- a/libmproxy/platform/osx.py
+++ b/libmproxy/platform/osx.py
@@ -16,5 +16,8 @@ class Resolver:
 
     def original_addr(self, csock):
         peer = csock.getpeername()
-        stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT)
+        try:
+            stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError:
+            return None
         return pf.lookup(peer[0], peer[1], stxt)
-- 
cgit v1.2.3