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

add decref calls to imagingft to fix #6321

Browse Source
This commit is contained in:
nulano 2022-05-24 16:36:30 +01:00
parent 26c79343ec
commit dacd5d6eb9
No known key found for this signature in database
GPG Key ID: B650CDF63B705766
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/_imagingft.c
View File

@ -303,7 +303,7 @@ text_layout_raqm(
goto failed; goto failed;
} }
len = PySequence_Size(seq); len = PySequence_Fast_GET_SIZE(seq);
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
PyObject *item = PySequence_Fast_GET_ITEM(seq, j); PyObject *item = PySequence_Fast_GET_ITEM(seq, j);
char *feature = NULL; char *feature = NULL;
@ -311,23 +311,26 @@ text_layout_raqm(
PyObject *bytes; PyObject *bytes;
if (!PyUnicode_Check(item)) { if (!PyUnicode_Check(item)) {
Py_DECREF(seq);
PyErr_SetString(PyExc_TypeError, "expected a string"); PyErr_SetString(PyExc_TypeError, "expected a string");
goto failed; goto failed;
} }
if (PyUnicode_Check(item)) {
bytes = PyUnicode_AsUTF8String(item); bytes = PyUnicode_AsUTF8String(item);
if (bytes == NULL) { if (bytes == NULL) {
Py_DECREF(seq);
goto failed; goto failed;
} }
feature = PyBytes_AS_STRING(bytes); feature = PyBytes_AS_STRING(bytes);
size = PyBytes_GET_SIZE(bytes); size = PyBytes_GET_SIZE(bytes);
}
if (!raqm_add_font_feature(rq, feature, size)) { if (!raqm_add_font_feature(rq, feature, size)) {
Py_DECREF(seq);
Py_DECREF(bytes);
PyErr_SetString(PyExc_ValueError, "raqm_add_font_feature() failed"); PyErr_SetString(PyExc_ValueError, "raqm_add_font_feature() failed");
goto failed; goto failed;
} }
Py_DECREF(bytes);
} }
Py_DECREF(seq);
} }
if (!raqm_set_freetype_face(rq, self->face)) { if (!raqm_set_freetype_face(rq, self->face)) {