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

coverity findings: fix possible derefencing of null pointer.

pull/739/head
Kim Kulling 2015-12-30 21:56:24 +01:00
parent 043fef6d21
commit 217ec76dfb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/NFFLoader.cpp
View File

@ -1139,8 +1139,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
mesh->mNumFaces = (unsigned int)src.faces.size(); mesh->mNumFaces = (unsigned int)src.faces.size();
// Generate sub nodes for named meshes // Generate sub nodes for named meshes
if (src.name[0]) if ( src.name[ 0 ] && NULL != ppcChildren ) {
{
aiNode* const node = *ppcChildren = new aiNode(); aiNode* const node = *ppcChildren = new aiNode();
node->mParent = root; node->mParent = root;
node->mNumMeshes = 1; node->mNumMeshes = 1;
@ -1161,8 +1160,9 @@ void NFFImporter::InternReadFile( const std::string& pFile,
mat.c4 = src.center.z; mat.c4 = src.center.z;
++ppcChildren; ++ppcChildren;
} else {
*pMeshes++ = m;
} }
else *pMeshes++ = m;
// copy vertex positions // copy vertex positions
mesh->mVertices = new aiVector3D[mesh->mNumVertices]; mesh->mVertices = new aiVector3D[mesh->mNumVertices];