[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34503] trunk/blender/source/blender/ python/intern/bpy_props.c: fix for crash when assigning unsupported type to collection properties.

Campbell Barton ideasman42 at gmail.com
Wed Jan 26 13:44:09 CET 2011


Revision: 34503
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34503
Author:   campbellbarton
Date:     2011-01-26 12:44:09 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
fix for crash when assigning unsupported type to collection properties.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_props.c

Modified: trunk/blender/source/blender/python/intern/bpy_props.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-26 12:26:44 UTC (rev 34502)
+++ trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-26 12:44:09 UTC (rev 34503)
@@ -692,13 +692,17 @@
 {
 	StructRNA *srna;
 
-	srna= srna_from_self(value, "BoolProperty(...):");
+	srna= srna_from_self(value, "");
 	if(!srna) {
-
-		PyObject *msg= PyC_ExceptionBuffer();
-		char *msg_char= _PyUnicode_AsString(msg);
-		PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from IDPropertyGroup, failed with: %s", error_prefix, msg_char);
-		Py_DECREF(msg);
+		if(PyErr_Occurred()) {
+			PyObject *msg= PyC_ExceptionBuffer();
+			char *msg_char= _PyUnicode_AsString(msg);
+			PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from IDPropertyGroup, failed with: %s", error_prefix, msg_char);
+			Py_DECREF(msg);
+		}
+		else {
+			PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from IDPropertyGroup, failed with type '%s'", error_prefix, Py_TYPE(value)->tp_name);
+		}
 		return NULL;
 	}
 




More information about the Bf-blender-cvs mailing list