archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #107017: Missing checks for #PyObject_GetBuffer success

Browse Source 
`PyObject_GetBuffer` was used without checking that it was successful.
This could cause the code to access an incompatible or uninitialized
`Py_buffer`.

Add the missing checks, and clears the raised `PyExc_BufferError`
to silently fall back to accessing the PyObject as a sequence.
This commit is contained in:
Thomas Barlow
2023-04-14 19:36:54 +01:00
committed by Campbell Barton
parent 1d8389cd09
commit 348f57bcec
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/python/generic/idprop_py_api.c
View File

@@ -600,14 +600,20 @@ static IDProperty *idp_from_PySequence(const char *name, PyObject *ob)
bool use_buffer = false;
if (PyObject_CheckBuffer(ob)) {
PyObject_GetBuffer(ob, &buffer, PyBUF_SIMPLE | PyBUF_FORMAT);
const char format = PyC_StructFmt_type_from_str(buffer.format);
if (PyC_StructFmt_type_is_float_any(format) ||
(PyC_StructFmt_type_is_int_any(format) && buffer.itemsize == 4)) {
use_buffer = true;
if (PyObject_GetBuffer(ob, &buffer, PyBUF_SIMPLE | PyBUF_FORMAT) == -1) {
/* Request failed. A `PyExc_BufferError` will have been raised,
* so clear it to silently fall back to accessing as a sequence. */
PyErr_Clear();
}
else {
PyBuffer_Release(&buffer);
const char format = PyC_StructFmt_type_from_str(buffer.format);
if (PyC_StructFmt_type_is_float_any(format) ||
(PyC_StructFmt_type_is_int_any(format) && buffer.itemsize == 4)) {
use_buffer = true;
}
else {
PyBuffer_Release(&buffer);
}
}
}