Skip to content
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

Raise ValueError when TrueType font size is zero or less #7584

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Raise ValueError when TrueType font size is zero or less #7584

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ec56c
Improve error message when creating TrueType fonts of invalid size
akx Nov 28, 2023
36e0b53
Update Tests/test_imagefont.py
akx Nov 29, 2023
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
Next Next commit
Improve error message when creating TrueType fonts of invalid size 
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
  • Loading branch information
@akx @radarhere
akx and radarhere committed Nov 28, 2023
commit 39ec56c6eaa015dde2280ab11e3fa5193f9ad9fb
6 changes: 6 additions & 0 deletions Tests/test_imagefont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,3 +1071,9 @@ def test_raqm_missing_warning(monkeypatch):
"Raqm layout was requested, but Raqm is not available. "
"Falling back to basic layout."
)


@pytest.mark.parametrize("size", [-1, 0])
def test_invalid_truetype_sizes_raise(layout_engine, size):
akx marked this conversation as resolved.
Show resolved Hide resolved
with pytest.raises(ValueError):
ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine)
5 changes: 5 additions & 0 deletions src/PIL/ImageFont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,13 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
.. versionadded:: 4.2.0
:return: A font object.
:exception OSError: If the file could not be read.
:exception ValueError: If the font size is not greater than zero.
"""

if size <= 0:
msg = "font size must be greater than 0"
raise ValueError(msg)

def freetype(font):
return FreeTypeFont(font, size, index, encoding, layout_engine)

Expand Down