Skip to content

Import fuzz_font from fuzz directory #9187

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
radarhere wants to merge 2 commits into from
Closed

Import fuzz_font from fuzz directory #9187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c58bf53
Moved Tests/oss-fuzz to Tests/oss_fuzz
radarhere Sep 3, 2025
8b4a716
Import fuzz_font from oss_fuzz directory
radarhere Sep 3, 2025
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ test-p:
.PHONY: valgrind
valgrind:
python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss_fuzz/python.supp --leak-check=no \
--log-file=/tmp/valgrind-output \
python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output

.PHONY: valgrind-leak
valgrind-leak:
python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp \
PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss_fuzz/python.supp \
--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite \
--log-file=/tmp/valgrind-output \
python3 -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output
Expand Down
0 Tests/oss-fuzz/build.sh → Tests/oss_fuzz/build.sh
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/build_dictionaries.sh → Tests/oss_fuzz/build_dictionaries.sh
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/fuzz_font.py → Tests/oss_fuzz/fuzz_font.py
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/fuzz_pillow.py → Tests/oss_fuzz/fuzz_pillow.py
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/fuzzers.py → Tests/oss_fuzz/fuzzers.py
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/python.supp → Tests/oss_fuzz/python.supp
View file
Open in desktop
File renamed without changes.
0 Tests/oss-fuzz/test_fuzzers.py → Tests/oss_fuzz/test_fuzzers.py
View file
Open in desktop
File renamed without changes.
14 changes: 4 additions & 10 deletions Tests/test_font_crash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,13 @@

import pytest

from PIL import ImageFont

from .helper import skip_unless_feature
from .oss_fuzz.fuzzers import fuzz_font


class TestFontCrash:
def _fuzz_font(self, font: ImageFont.FreeTypeFont) -> None:
# from fuzzers.fuzz_font
font.getbbox("ABC")
font.getmask("test text")

@skip_unless_feature("freetype2")
def test_segfault(self) -> None:
with pytest.raises(OSError):
font = ImageFont.truetype("Tests/fonts/fuzz_font-5203009437302784")
self._fuzz_font(font)
with open("Tests/fonts/fuzz_font-5203009437302784", "rb") as fp:
with pytest.raises(OSError):
fuzz_font(fp.read())
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ lint.ignore = [
"PYI034", # flake8-pyi: typing.Self added in Python 3.11
"UP038", # pyupgrade: deprecated rule
]
lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [
lint.per-file-ignores."Tests/oss_fuzz/fuzz_font.py" = [
"I002",
]
lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [
lint.per-file-ignores."Tests/oss_fuzz/fuzz_pillow.py" = [
"I002",
]
lint.flake8-pytest-style.parametrize-names-type = "csv"
Expand Down
Loading