python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3912 from radarhere/non_font_bytes

Browse Source 
Fixed crash when loading non-font bytes
This commit is contained in:
Hugo 2019-06-27 22:40:29 +03:00 committed by GitHub
commit b584635a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/test_imagefont.py
View File

@ -420,6 +420,10 @@ class TestImageFont(PillowTestCase):
self.assertRaises(IOError, ImageFont.load_path, filename) self.assertRaises(IOError, ImageFont.load_path, filename)
self.assertRaises(IOError, ImageFont.truetype, filename) self.assertRaises(IOError, ImageFont.truetype, filename)
def test_load_non_font_bytes(self):
with open("Tests/images/hopper.jpg", "rb") as f:
self.assertRaises(IOError, ImageFont.truetype, f)
def test_default_font(self): def test_default_font(self):
# Arrange # Arrange
txt = 'This is a "better than nothing" default font.' txt = 'This is a "better than nothing" default font.'

2
src/PIL/ImageFont.py
View File

@ -545,6 +545,8 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
try: try:
return freetype(font) return freetype(font)
except IOError: except IOError:
if not isPath(font):
raise
ttf_filename = os.path.basename(font) ttf_filename = os.path.basename(font)
dirs = [] dirs = []

1
src/_imagingft.c
View File

@ -315,6 +315,7 @@ getfont(PyObject* self_, PyObject* args, PyObject* kw)
if (error) { if (error) {
if (self->font_bytes) { if (self->font_bytes) {
PyMem_Free(self->font_bytes); PyMem_Free(self->font_bytes);
self->font_bytes = NULL;
} }
Py_DECREF(self); Py_DECREF(self);
return geterror(error); return geterror(error);