[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35359] trunk/blender/source/blender/ python/intern/bpy_rna_array.c: fix [#26323] Crash when adding to a vertex group with a raw in

Campbell Barton ideasman42 at gmail.com
Sat Mar 5 06:02:37 CET 2011


Revision: 35359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35359
Author:   campbellbarton
Date:     2011-03-05 05:02:37 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
fix [#26323] Crash when adding to a vertex group with a raw in

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

Modified: trunk/blender/source/blender/python/intern/bpy_rna_array.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-03-05 04:35:36 UTC (rev 35358)
+++ trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-03-05 05:02:37 UTC (rev 35359)
@@ -67,6 +67,10 @@
 	if (dim + 1 < totdim) {
 		/* check that a sequence contains dimsize[dim] items */
 		const int seq_size= PySequence_Size(seq);
+		if(seq_size == -1) {
+			PyErr_Format(PyExc_ValueError, "%s sequence expected at dimension %d, not %s", error_prefix, (int)dim + 1, Py_TYPE(seq)->tp_name);
+			return 0;
+		}
 		for (i= 0; i < seq_size; i++) {
 			PyObject *item;
 			int ok= 1;
@@ -100,6 +104,10 @@
 	else {
 		/* check that items are of correct type */
 		const int seq_size= PySequence_Size(seq);
+		if(seq_size == -1) {
+			PyErr_Format(PyExc_ValueError, "%s sequence expected at dimension %d, not %s", error_prefix, (int)dim + 1, Py_TYPE(seq)->tp_name);
+			return 0;
+		}
 		for (i= 0; i < seq_size; i++) {
 			PyObject *item= PySequence_GetItem(seq, i);
 




More information about the Bf-blender-cvs mailing list