Skip to content

Fix recursion error on malformed use tags #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

Closed
arthurdarcet wants to merge 2 commits into from
Closed

Fix recursion error on malformed use tags #239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2dfd3f
more lenient when parsing the href attr of a <use> tag
arthurdarcet May 6, 2019
796bbac
raise an exception on invalid use tags, instead of triggering an infi…
arthurdarcet May 6, 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
10 changes: 9 additions & 1 deletion cairosvg/defs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,15 @@ def use(surface, node):
del node['viewBox']
if 'mask' in node:
del node['mask']
href = parse_url(node.get('{http://www.w3.org/1999/xlink}href')).geturl()

# the href attr should be in the xlink namespace,
# but some libs do not respect this
href = node.get('{http://www.w3.org/1999/xlink}href') or node.get('href')
href = parse_url(href).geturl()

if not href:
raise ValueError('Invalid <use> tag: {!r}'.format(node))

tree = Tree(
url=href, url_fetcher=node.url_fetcher, parent=node,
tree_cache=surface.tree_cache, unsafe=node.unsafe)
Expand Down