diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-04-08 15:15:02 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-04-08 15:15:02 +1200 |
| commit | 618a9c0e2b447f200afec8b2dcdba3c3426a17fa (patch) | |
| tree | 2d5943cd1f10beae56c568ed76ab352edbbdcc76 /libmproxy/console/contentview.py | |
| parent | c1788c37a14d74a0324c973590930cb60c34c9cd (diff) | |
| parent | 7d90eb65edf58815296f41931dba38d3051a41d7 (diff) | |
| download | mitmproxy-618a9c0e2b447f200afec8b2dcdba3c3426a17fa.tar.gz mitmproxy-618a9c0e2b447f200afec8b2dcdba3c3426a17fa.tar.bz2 mitmproxy-618a9c0e2b447f200afec8b2dcdba3c3426a17fa.zip | |
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
Diffstat (limited to 'libmproxy/console/contentview.py')
| -rw-r--r-- | libmproxy/console/contentview.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 7ac535bb..1abb3172 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -232,7 +232,11 @@ def view_urlencoded(hdrs, content): def view_javascript(hdrs, content): opts = jsbeautifier.default_options() 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)) |