aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-02-09 12:09:40 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-02-09 12:09:40 +1300
commit46bd7808625543bb42d1c1f20ff5599b837d1ca8 (patch)
tree7e7a599bee26e28a0c33a317faf0acec9c67a099 /libmproxy/dump.py
parentd3dce8f9433c7e3c78821d4378911861f0a785bb (diff)
downloadmitmproxy-46bd7808625543bb42d1c1f20ff5599b837d1ca8.tar.gz
mitmproxy-46bd7808625543bb42d1c1f20ff5599b837d1ca8.tar.bz2
mitmproxy-46bd7808625543bb42d1c1f20ff5599b837d1ca8.zip
Gracefully handle invalid data format passed to -r flag.
Diffstat (limited to 'libmproxy/dump.py')
-rw-r--r--libmproxy/dump.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index 2ad88cfc..d71aed42 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -103,7 +103,10 @@ class DumpMaster(flow.FlowMaster):
freader = flow.FlowReader(f)
except IOError, v:
raise DumpError(v.strerror)
- self.load_flows(freader)
+ try:
+ self.load_flows(freader)
+ except flow.FlowReadError, v:
+ raise DumpError(v)
def _readflow(self, path):