From ced080f9f388061f5889f0ee4d74d3844aff06bd Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 15 Jun 2019 19:17:15 +0200 Subject: [PATCH] X: fix out of bound access. --- code/X/XFileImporter.cpp | 7 +++++-- code/X/XFileImporter.h | 6 +++--- test/models/PLY/cube_test.ply | 2 +- test/unit/utBlendImportMaterials.cpp | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/code/X/XFileImporter.cpp b/code/X/XFileImporter.cpp index 10547bb8a..be7256d5c 100644 --- a/code/X/XFileImporter.cpp +++ b/code/X/XFileImporter.cpp @@ -332,7 +332,7 @@ void XFileImporter::CreateMeshes( aiScene* pScene, aiNode* pNode, const std::vec // collect vertex data for indices of this face for( unsigned int d = 0; d < df.mNumIndices; ++d ) { - df.mIndices[d] = newIndex; + df.mIndices[ d ] = newIndex; const unsigned int newIdx( pf.mIndices[ d ] ); if ( newIdx > sourceMesh->mPositions.size() ) { continue; @@ -344,7 +344,10 @@ void XFileImporter::CreateMeshes( aiScene* pScene, aiNode* pNode, const std::vec mesh->mVertices[newIndex] = sourceMesh->mPositions[pf.mIndices[d]]; // Normal, if present if ( mesh->HasNormals() ) { - mesh->mNormals[ newIndex ] = sourceMesh->mNormals[ sourceMesh->mNormFaces[ f ].mIndices[ d ] ]; + if ( sourceMesh->mNormFaces[ f ].mIndices.size() > d ) { + const size_t idx( sourceMesh->mNormFaces[ f ].mIndices[ d ] ); + mesh->mNormals[ newIndex ] = sourceMesh->mNormals[ idx ]; + } } // texture coord sets diff --git a/code/X/XFileImporter.h b/code/X/XFileImporter.h index d1b8d3f47..7d12b6fdf 100644 --- a/code/X/XFileImporter.h +++ b/code/X/XFileImporter.h @@ -58,13 +58,13 @@ struct aiNode; namespace Assimp { namespace XFile { -struct Scene; -struct Node; + struct Scene; + struct Node; } // --------------------------------------------------------------------------- /** The XFileImporter is a worker class capable of importing a scene from a - * DirectX file .x + * DirectX file .x */ class XFileImporter : public BaseImporter { public: diff --git a/test/models/PLY/cube_test.ply b/test/models/PLY/cube_test.ply index bb0839286..194798cf0 100644 --- a/test/models/PLY/cube_test.ply +++ b/test/models/PLY/cube_test.ply @@ -1,6 +1,6 @@ ply format ascii 1.0 -comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.2760932948) +comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.3945266037) element vertex 8 property float x property float y diff --git a/test/unit/utBlendImportMaterials.cpp b/test/unit/utBlendImportMaterials.cpp index cefacbe27..151c614c0 100644 --- a/test/unit/utBlendImportMaterials.cpp +++ b/test/unit/utBlendImportMaterials.cpp @@ -133,10 +133,10 @@ TEST_F(BlendImportMaterials, testImportMaterialwith2texturesAnd2TexCoordMappings // material has 2 diffuse textures ASSERT_TRUE(pTest->HasMaterials()); - EXPECT_EQ(1, pTest->mNumMaterials); + EXPECT_EQ(1u, pTest->mNumMaterials); const aiMaterial *pMat = pTest->mMaterials[0]; ASSERT_TRUE(nullptr != pMat); - ASSERT_EQ(2, pMat->GetTextureCount(aiTextureType_DIFFUSE)); + ASSERT_EQ(2u, pMat->GetTextureCount(aiTextureType_DIFFUSE)); aiString aPath; aiTextureMapping tm = aiTextureMapping::aiTextureMapping_OTHER; aiReturn result = pMat->GetTexture(aiTextureType_DIFFUSE, 0, &aPath, &tm); @@ -146,7 +146,7 @@ TEST_F(BlendImportMaterials, testImportMaterialwith2texturesAnd2TexCoordMappings // mesh has 2 texturecoord sets ASSERT_TRUE(pTest->HasMeshes()); - EXPECT_EQ(1, pTest->mNumMeshes); + EXPECT_EQ(1u, pTest->mNumMeshes); const aiMesh *pMesh = pTest->mMeshes[0]; ASSERT_TRUE(nullptr != pMesh); ASSERT_TRUE(pMesh->HasTextureCoords(0));