[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37658] trunk/blender/source/blender/ collada/MeshImporter.cpp: Fix [#27474] Blender crashes on collada import if input_set is missing

Nathan Letwory nathan at letworyinteractive.com
Mon Jun 20 11:34:35 CEST 2011


Revision: 37658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37658
Author:   jesterking
Date:     2011-06-20 09:34:35 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Fix [#27474] Blender crashes on collada import if input_set is missing
reported by Rebin Cornelius.

This needs patch from upstream report http://code.google.com/p/opencollada/issues/list?thanks=164 applied to OpenCOLLADA. lib/windows/collada and lib/win64/collada have already been updated. Ensures we don't read past array boundaries.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/MeshImporter.cpp

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp	2011-06-20 09:31:03 UTC (rev 37657)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp	2011-06-20 09:34:35 UTC (rev 37658)
@@ -755,9 +755,11 @@
 								 MTex *color_texture)
 {
 	const COLLADAFW::TextureMapId texture_index = ctexture.getTextureMapId();
-	const size_t setindex = ctexture.getSetIndex();
+	size_t setindex = ctexture.getSetIndex();
 	std::string uvname = ctexture.getSemantic();
 	
+	if(setindex==-1) return NULL;
+	
 	const CustomData *data = &me->fdata;
 	int layer_index = CustomData_get_layer_index(data, CD_MTFACE);
 	CustomDataLayer *cdl = &data->layers[layer_index+setindex];




More information about the Bf-blender-cvs mailing list