Skip to content

Handle iteration errors during frame traversal #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untitaker merged 4 commits into from
Jan 18, 2019
Merged

Handle iteration errors during frame traversal #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db0d57f
Handle iteration errors during frame traversal
leotrubach Jan 18, 2019
90aaa7e
Fixes as suggested by @untitaker
leotrubach Jan 18, 2019
487d8da
Add explanatory comments
leotrubach Jan 18, 2019
f7de541
Replace deprecated `render_to_response` with `render`
leotrubach Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ def safe_repr(value):
def object_to_json(obj):
def _walk(obj, depth):
if depth < 4:
if isinstance(obj, Sequence) and not isinstance(obj, (bytes, text_type)):
if isinstance(obj, (list, tuple)):
# It is not safe to iterate over another sequence types as this may raise errors or
# bring undesired side-effects (e.g. Django querysets are executed during iteration)
return [_walk(x, depth + 1) for x in obj]
if isinstance(obj, Mapping):
return {safe_str(k): _walk(v, depth + 1) for k, v in obj.items()}
Expand Down
6 changes: 3 additions & 3 deletions tests/integrations/django/myapp/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.contrib.auth import login
from django.contrib.auth.models import User
from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound
from django.shortcuts import render_to_response
from django.shortcuts import render
from django.views.generic import ListView

import sentry_sdk
Expand Down Expand Up @@ -45,5 +45,5 @@ def handler404(*args, **kwargs):
return HttpResponseNotFound("404")


def template_exc(*args, **kwargs):
return render_to_response("error.html")
def template_exc(request, *args, **kwargs):
return render(request, "error.html")