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

MDC-Loader: fix a possible nullptr access.

pull/2112/head
Kim Kulling 2018-08-31 19:29:17 +02:00
parent a872e7d908
commit a7306abcfe
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -111,9 +111,9 @@ OPTION( INJECT_DEBUG_POSTFIX
) )
IF (IOS) IF (IOS)
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release") SET(CMAKE_BUILD_TYPE "Release")
ENDIF (NOT CMAKE_BUILD_TYPE) ENDIF (NOT CMAKE_BUILD_TYPE)
ENDIF (IOS) ENDIF (IOS)
# Use subset of Windows.h # Use subset of Windows.h

10
code/MDCLoader.cpp
View File

@ -434,10 +434,12 @@ void MDCImporter::InternReadFile(
else if (1 == pScene->mNumMeshes) else if (1 == pScene->mNumMeshes)
{ {
pScene->mRootNode = new aiNode(); pScene->mRootNode = new aiNode();
pScene->mRootNode->mName = pScene->mMeshes[0]->mName; if ( nullptr != pScene->mMeshes[0] ) {
pScene->mRootNode->mNumMeshes = 1; pScene->mRootNode->mName = pScene->mMeshes[0]->mName;
pScene->mRootNode->mMeshes = new unsigned int[1]; pScene->mRootNode->mNumMeshes = 1;
pScene->mRootNode->mMeshes[0] = 0; pScene->mRootNode->mMeshes = new unsigned int[1];
pScene->mRootNode->mMeshes[0] = 0;
}
} }
else else
{ {