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

partial fix for [#32581] Mesh properties API does not allow for zeros in byte array

Browse Source 
bmesh access allows zero bytes, support still needs adding via RNA.
This commit is contained in:
Campbell Barton
2013-01-09 13:25:46 +00:00
parent 2d526c23dd
commit f9c87b86fc
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/python/bmesh/bmesh_py_types_customdata.c
View File

@@ -981,7 +981,7 @@ PyObject *BPy_BMLayerItem_GetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer)
case CD_PROP_STR:
{
MStringProperty *mstring = value;
ret = PyBytes_FromStringAndSize(mstring->s, BLI_strnlen(mstring->s, sizeof(mstring->s)));
ret = PyBytes_FromStringAndSize(mstring->s, mstring->s_len);
break;
}
case CD_MTEXPOLY:
@@ -1067,13 +1067,17 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj
case CD_PROP_STR:
{
MStringProperty *mstring = value;
const char *tmp_val = PyBytes_AsString(py_value);
if (UNLIKELY(tmp_val == NULL)) {
char *tmp_val;
Py_ssize_t tmp_val_len;
if (UNLIKELY(PyBytes_AsStringAndSize(py_value, &tmp_val, &tmp_val_len) == -1)) {
PyErr_Format(PyExc_TypeError, "expected bytes, not a %.200s", Py_TYPE(py_value)->tp_name);
ret = -1;
}
else {
BLI_strncpy(mstring->s, tmp_val, min_ii(PyBytes_Size(py_value), sizeof(mstring->s)));
if (tmp_val_len > sizeof(mstring->s))
tmp_val_len = sizeof(mstring->s);
memcpy(mstring->s, tmp_val, tmp_val_len);
mstring->s_len = tmp_val_len;
}
break;
}