Skip to content

Repository navigation

Return None instead of crashing on an invalid alpha in color5 #82

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
RavSinghChandan wants to merge 1 commit into from
Closed

Return None instead of crashing on an invalid alpha in color5 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions tests/test_tinycss2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,15 @@ def test_color_currentcolor_5():
assert parse_color5(value) == 'currentcolor'


@pytest.mark.parametrize('input', [
'device-cmyk(0 0 0 0 / foo)',
'device-cmyk(0 0 0 0 / 1 2)',
'color(--custom 1 0 0 / foo)',
])
def test_color_invalid_alpha_5(input):
assert parse_color5(input) is None


@json_test()
def test_color_function_4(input):
return _build_color(parse_color4(input))
Expand Down
6 changes: 4 additions & 2 deletions tinycss2/color5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ def parse_color(input, color_schemes=None):
tokens = tokens[:index]
break

if (alpha := color4._parse_alpha(alpha)) is None:
return
if name == 'device-cmyk':
return _parse_device_cmyk(tokens, color4._parse_alpha(alpha), old_syntax)
return _parse_device_cmyk(tokens, alpha, old_syntax)
elif name == 'color':
return _parse_color(space, tokens, color4._parse_alpha(alpha))
return _parse_color(space, tokens, alpha)
elif name == 'light-dark':
return _parse_light_dark(tokens, color_scheme)
else:
Expand Down