Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Add error checking to ViewProtobuf

Browse Source 
There are protobufs that protoc can't parse.  When protoc --decode_raw
fails, it returns nothing to stdin, and writes "Failed to parse input."
to stderr. Before this commit, if protoc --decode_raw couldn't parse
the protobuf, the blank stdout output would get returned to the view;
with this commit stderr gets caught and returned to the view.
This commit is contained in:
Jason A. Novak 2013-04-21 12:46:37 -05:00
parent 61c794e08f
commit f78dada550
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmproxy/console/contentview.py
View File

@ -389,8 +389,11 @@ class ViewProtobuf:
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
out, _ = p.communicate(input=content) out, err = p.communicate(input=content)
if out:
return out return out
else:
return err
def __call__(self, hdrs, content, limit): def __call__(self, hdrs, content, limit):
decoded = self.decode_protobuf(content) decoded = self.decode_protobuf(content)