diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-05-04 17:37:32 -0700 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-05-04 17:37:32 -0700 |
| commit | 69a40c817935d08878192f87c85408bc10ca8d89 (patch) | |
| tree | e2e0a7b75428573f01343083ad9e68e259f6c63f | |
| parent | 61c794e08f7b2359f3a7a7658840d3f26db25e16 (diff) | |
| parent | f78dada550dac02ea1dc69a7a00fcdfc7a8c996f (diff) | |
| download | mitmproxy-69a40c817935d08878192f87c85408bc10ca8d89.tar.gz mitmproxy-69a40c817935d08878192f87c85408bc10ca8d89.tar.bz2 mitmproxy-69a40c817935d08878192f87c85408bc10ca8d89.zip | |
Merge pull request #118 from jasonanovak/protobufs
Add error checking to ViewProtobuf
| -rw-r--r-- | libmproxy/console/contentview.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 53841c73..8dd8ad1d 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -389,8 +389,11 @@ class ViewProtobuf: stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - out, _ = p.communicate(input=content) - return out + out, err = p.communicate(input=content) + if out: + return out + else: + return err def __call__(self, hdrs, content, limit): decoded = self.decode_protobuf(content) |