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

modify my last commit to fix [#22486] add_actuator crashes when name is bigger than 32 chars

Browse Source 
Throwing an exception if the strings too long means scripts need to be aware of string lengths and changing a string length in RNA can too easily break scripts.
Instead honor the string length in RNA_property_string_set()
This commit is contained in:
Campbell Barton
2010-06-12 17:30:21 +00:00
parent c3c6fb2de2
commit 971e4be108
4 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/python/intern/bpy_rna.c
View File

@@ -924,16 +924,11 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, ParameterList *parms, v
}
case PROP_STRING:
{
Py_ssize_t param_len;
int param_maxlen= RNA_property_string_maxlength(prop) - 1;
char *param = _PyUnicode_AsStringAndSize(value, &param_len);
char *param = _PyUnicode_AsString(value);
if (param==NULL) {
PyErr_Format(PyExc_TypeError, "%.200s %.200s.%.200s expected a string type", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop));
return -1;
} else if (param_maxlen != -1 && param_len > param_maxlen) { /* -1 because it includes the \0 */
PyErr_Format(PyExc_TypeError, "%.200s %.200s.%.200s string is length %d, expected maximum of %d", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), (int)param_len, param_maxlen);
return -1;
}
else {
if(data) *((char**)data)= param;