v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# fix potential LWO crashbug related to UV processing [http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4070109] 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@899 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2011-02-03 13:22:38 +00:00
parent 0d5ac4725a
commit 58ce3ee879
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/LWOLoader.cpp
View File

@ -294,7 +294,9 @@ void LWOImporter::InternReadFile( const std::string& pFile,
aiColor4D* pvVC[AI_MAX_NUMBER_OF_COLOR_SETS]; aiColor4D* pvVC[AI_MAX_NUMBER_OF_COLOR_SETS];
for (unsigned int mui = 0; mui < AI_MAX_NUMBER_OF_COLOR_SETS;++mui) { for (unsigned int mui = 0; mui < AI_MAX_NUMBER_OF_COLOR_SETS;++mui) {
if (0xffffffff == vVColorIndices[mui])break; if (0xffffffff == vVColorIndices[mui]) {
break;
}
pvVC[mui] = mesh->mColors[mui] = new aiColor4D[mesh->mNumVertices]; pvVC[mui] = mesh->mColors[mui] = new aiColor4D[mesh->mNumVertices];
} }

11
code/LWOMaterial.cpp
View File

@ -425,7 +425,7 @@ void LWOImporter::FindUVChannels(LWO::Surface& surf,
if (uv.abAssigned[idx] && ((aiVector2D*)&uv.rawData[0])[idx] != aiVector2D()) { if (uv.abAssigned[idx] && ((aiVector2D*)&uv.rawData[0])[idx] != aiVector2D()) {
if (next >= AI_MAX_NUMBER_OF_TEXTURECOORDS) { if (extra >= AI_MAX_NUMBER_OF_TEXTURECOORDS) {
DefaultLogger::get()->error("LWO: Maximum number of UV channels for " DefaultLogger::get()->error("LWO: Maximum number of UV channels for "
"this mesh reached. Skipping channel \'" + uv.name + "\'"); "this mesh reached. Skipping channel \'" + uv.name + "\'");
@ -442,9 +442,9 @@ void LWOImporter::FindUVChannels(LWO::Surface& surf,
had |= FindUVChannels(surf.mBumpTextures,layer,uv,next); had |= FindUVChannels(surf.mBumpTextures,layer,uv,next);
had |= FindUVChannels(surf.mReflectionTextures,layer,uv,next); had |= FindUVChannels(surf.mReflectionTextures,layer,uv,next);
// We have a texture referencing this UV channel so we have to take special care
// and are willing to drop unreferenced channels in favour of it.
if (had != 0) { if (had != 0) {
// We have a texture referencing this UV channel so we have to take special care of it
if (num_extra) { if (num_extra) {
for (unsigned int a = next; a < std::min( extra, AI_MAX_NUMBER_OF_TEXTURECOORDS-1u ); ++a) { for (unsigned int a = next; a < std::min( extra, AI_MAX_NUMBER_OF_TEXTURECOORDS-1u ); ++a) {
@ -454,9 +454,8 @@ void LWOImporter::FindUVChannels(LWO::Surface& surf,
++extra; ++extra;
out[next++] = i; out[next++] = i;
} }
// Bäh ... seems not to be used at all. Push to end if enough space is available.
else { else {
// Bäh ... seems not to be used at all. Push to end if enough space is available.
out[extra++] = i; out[extra++] = i;
++num_extra; ++num_extra;
} }
@ -467,7 +466,7 @@ void LWOImporter::FindUVChannels(LWO::Surface& surf,
} }
} }
} }
if (next != AI_MAX_NUMBER_OF_TEXTURECOORDS) { if (extra < AI_MAX_NUMBER_OF_TEXTURECOORDS) {
out[extra] = 0xffffffff; out[extra] = 0xffffffff;
} }
} }