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

Merge pull request #8662 from radarhere/pyunicode

Browse Source
This commit is contained in:
Hugo van Kemenade 2025-01-08 19:05:49 +02:00 committed by GitHub
commit b69f2045d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/_imagingft.c
View File

@ -339,29 +339,23 @@ text_layout_raqm(
len = PySequence_Fast_GET_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;
Py_ssize_t size = 0;
PyObject *bytes;
if (!PyUnicode_Check(item)) { if (!PyUnicode_Check(item)) {
Py_DECREF(seq); Py_DECREF(seq);
PyErr_SetString(PyExc_TypeError, "expected a string"); PyErr_SetString(PyExc_TypeError, "expected a string");
goto failed; goto failed;
} }
bytes = PyUnicode_AsUTF8String(item);
if (bytes == NULL) { Py_ssize_t size;
const char *feature = PyUnicode_AsUTF8AndSize(item, &size);
if (feature == NULL) {
Py_DECREF(seq); Py_DECREF(seq);
goto failed; goto failed;
} }
feature = PyBytes_AS_STRING(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(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); Py_DECREF(seq);
} }