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

REDxEYE · Nov 29, 2023 · 54c5631 · 54c5631
2 parents 697c24b + 36e0b53
commit 54c5631
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -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_valueerror(layout_engine, size):
+    with pytest.raises(ValueError):
+        ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine)
diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -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)