[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61197] trunk/blender/source/blender/ python/generic/idprop_py_api.c: fix for crash when deleting from an id property, with a non-string key.
Campbell Barton
ideasman42 at gmail.com
Fri Nov 8 09:46:44 CET 2013
Revision: 61197
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61197
Author: campbellbarton
Date: 2013-11-08 08:46:43 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
fix for crash when deleting from an id property, with a non-string key.
Modified Paths:
--------------
trunk/blender/source/blender/python/generic/idprop_py_api.c
Modified: trunk/blender/source/blender/python/generic/idprop_py_api.c
===================================================================
--- trunk/blender/source/blender/python/generic/idprop_py_api.c 2013-11-07 23:40:06 UTC (rev 61196)
+++ trunk/blender/source/blender/python/generic/idprop_py_api.c 2013-11-08 08:46:43 UTC (rev 61197)
@@ -525,7 +525,17 @@
}
if (val == NULL) { /* del idprop[key] */
- IDProperty *pkey = IDP_GetPropertyFromGroup(prop, _PyUnicode_AsString(key));
+ IDProperty *pkey;
+ const char *name = _PyUnicode_AsString(key);
+
+ if (name == NULL) {
+ PyErr_Format(PyExc_KeyError,
+ "expected a string, not %.200s",
+ Py_TYPE(key)->tp_name);
+ return -1;
+ }
+
+ pkey = IDP_GetPropertyFromGroup(prop, name);
if (pkey) {
IDP_FreeFromGroup(prop, pkey);
return 0;
More information about the Bf-blender-cvs
mailing list