python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-14 03:21:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7584 from akx/truetype-size-validation

Browse Source
This commit is contained in:
Hugo van Kemenade 2023-11-29 17:16:51 +02:00 committed by GitHub
commit 54c5631fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_imagefont.py
View File

@ -1071,3 +1071,9 @@ def test_raqm_missing_warning(monkeypatch):
"Raqm layout was requested, but Raqm is not available. " "Raqm layout was requested, but Raqm is not available. "
"Falling back to basic layout." "Falling back to basic layout."
) )
@pytest.mark.parametrize("size", [-1, 0])
def test_invalid_truetype_sizes_raise_valueerror(layout_engine, size):
with pytest.raises(ValueError):
ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine)

5
src/PIL/ImageFont.py
View File

@ -788,8 +788,13 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
.. versionadded:: 4.2.0 .. versionadded:: 4.2.0
:return: A font object. :return: A font object.
:exception OSError: If the file could not be read. :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): def freetype(font):
return FreeTypeFont(font, size, index, encoding, layout_engine) return FreeTypeFont(font, size, index, encoding, layout_engine)