diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-11 15:16:31 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-11 15:16:31 +1300 |
commit | 9f16a84a9e771dbbc3314daafaf63449de73d3eb (patch) | |
tree | a3e610eb6e629bf918d21cd9c22061ac487f0e36 /libmproxy/dump.py | |
parent | 7d85db0da31186a5a80d3a925ab6382f6e5b42f9 (diff) | |
download | mitmproxy-9f16a84a9e771dbbc3314daafaf63449de73d3eb.tar.gz mitmproxy-9f16a84a9e771dbbc3314daafaf63449de73d3eb.tar.bz2 mitmproxy-9f16a84a9e771dbbc3314daafaf63449de73d3eb.zip |
Make mitmdump handle invalid serialized data gracefully.
Diffstat (limited to 'libmproxy/dump.py')
-rw-r--r-- | libmproxy/dump.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 2eb0035e..97232ac7 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -93,7 +93,7 @@ class DumpMaster(flow.FlowMaster): try: f = file(path, "r") flows = list(flow.FlowReader(f).stream()) - except IOError, v: + except (IOError, flow.FlowReadError), v: raise DumpError(v.strerror) return flows @@ -182,7 +182,6 @@ class DumpMaster(flow.FlowMaster): return f - # begin nocover def run(self): try: |