mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20368 -- Made TECHNICAL_500 more robust against bad input.

Browse Source 
This limits large variables and avoids non-utf-8 in the TECHNICAL_500 output.
This commit is contained in:
Walter Doekes
2014-08-13 15:32:14 +02:00
committed by Tim Graham
parent d441a9d006
commit e0e28bfe71
2 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/views/debug.py
View File

@@ -309,7 +309,17 @@ class ExceptionReporter(object):
frames = self.get_traceback_frames()
for i, frame in enumerate(frames):
if 'vars' in frame:
frame['vars'] = [(k, force_escape(pprint(v))) for k, v in frame['vars']]
frame_vars = []
for k, v in frame['vars']:
v = pprint(v)
# The force_escape filter assume unicode, make sure that works
if isinstance(v, six.binary_type):
v = v.decode('utf-8', 'replace') # don't choke on non-utf-8 input
# Trim large blobs of data
if len(v) > 4096:
v = '%s... <trimmed %d bytes string>' % (v[0:4096], len(v))
frame_vars.append((k, force_escape(v)))
frame['vars'] = frame_vars
frames[i] = frame
unicode_hint = ''