griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash assigning non UTF8 path to imbuf.filepath

Browse Source
This commit is contained in:
Campbell Barton
2025-06-26 19:10:13 +10:00
parent 2ce3e8c877
commit c3d5e429ac
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/python/generic/imbuf_py_api.cc
View File

@@ -322,13 +322,16 @@ static int py_imbuf_filepath_set(Py_ImBuf *self, PyObject *value, void * /*closu
ImBuf *ibuf = self->ibuf;
const Py_ssize_t value_str_len_max = sizeof(ibuf->filepath);
PyObject *value_coerce = nullptr;
Py_ssize_t value_str_len;
const char *value_str = PyUnicode_AsUTF8AndSize(value, &value_str_len);
const char *value_str = PyC_UnicodeAsBytesAndSize(value, &value_str_len, &value_coerce);
if (value_str_len >= value_str_len_max) {
PyErr_Format(PyExc_TypeError, "filepath length over %zd", value_str_len_max - 1);
Py_XDECREF(value_coerce);
return -1;
}
memcpy(ibuf->filepath, value_str, value_str_len + 1);
Py_XDECREF(value_coerce);
return 0;
}