python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 17:36:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed decompression bomb check

Browse Source
This commit is contained in:
Andrew Murray 2023-06-17 14:35:44 +10:00
parent 98cc2e63ac
commit 7044038e70
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/fonts/oom-4da0210eb7081b0bf15bf16cc4c52ce02c1e1bbc.ttf Normal file
View File

Binary file not shown.

1
Tests/test_imagefont.py
View File

@ -1042,6 +1042,7 @@ def test_render_mono_size():
"test_file", "test_file",
[ [
"Tests/fonts/oom-e8e927ba6c0d38274a37c1567560eb33baf74627.ttf", "Tests/fonts/oom-e8e927ba6c0d38274a37c1567560eb33baf74627.ttf",
"Tests/fonts/oom-4da0210eb7081b0bf15bf16cc4c52ce02c1e1bbc.ttf",
], ],
) )
def test_oom(test_file): def test_oom(test_file):

2
src/_imagingft.c
View File

@ -880,7 +880,7 @@ font_render(FontObject *self, PyObject *args) {
width += stroke_width * 2 + ceil(x_start); width += stroke_width * 2 + ceil(x_start);
height += stroke_width * 2 + ceil(y_start); height += stroke_width * 2 + ceil(y_start);
if (max_image_pixels != Py_None) { if (max_image_pixels != Py_None) {
if (width * height > PyLong_AsLong(max_image_pixels) * 2) { if ((long long)width * height > PyLong_AsLong(max_image_pixels) * 2) {
PyMem_Del(glyph_info); PyMem_Del(glyph_info);
return Py_BuildValue("O(ii)(ii)", Py_None, width, height, 0, 0); return Py_BuildValue("O(ii)(ii)", Py_None, width, height, 0, 0);
} }