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

Catch all errors when using jsbeautifier.

Browse Source 
Turns out there are some problems that can raise arbitrary exceptions.
This commit is contained in:
Aldo Cortesi 2012-04-08 14:40:59 +12:00
parent a4f7728fad
commit 7d90eb65ed
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmproxy/console/contentview.py
View File

@ -232,7 +232,11 @@ def view_urlencoded(hdrs, content):
def view_javascript(hdrs, content): def view_javascript(hdrs, content):
opts = jsbeautifier.default_options() opts = jsbeautifier.default_options()
opts.indent_size = 2 opts.indent_size = 2
res = jsbeautifier.beautify(content[:VIEW_CUTOFF], opts) try:
res = jsbeautifier.beautify(content[:VIEW_CUTOFF], opts)
except:
# Bugs in jsbeautifier mean that it can trhow arbitrary errors.
return None
return "JavaScript", _view_text(res, len(content)) return "JavaScript", _view_text(res, len(content))