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

Try to fix issue 4238 

- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
pull/4609/head
Kim Kulling 2022-07-05 20:05:10 +02:00 committed by GitHub
parent 245cd66d11
commit a6b1a35748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/AssetLib/MDL/MDLMaterialLoader.cpp
View File

@ -448,7 +448,9 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
unsigned int iType, unsigned int iType,
unsigned int iWidth, unsigned int iWidth,
unsigned int iHeight) { unsigned int iHeight) {
std::unique_ptr<aiTexture> pcNew; if (szCurrent == nullptr) {
return;
}
// get the type of the skin // get the type of the skin
unsigned int iMasked = (unsigned int)(iType & 0xF); unsigned int iMasked = (unsigned int)(iType & 0xF);
@ -468,6 +470,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
return; return;
} }
std::unique_ptr<aiTexture> pcNew;
pcNew.reset(new aiTexture); pcNew.reset(new aiTexture);
pcNew->mHeight = 0; pcNew->mHeight = 0;
pcNew->mWidth = iWidth; pcNew->mWidth = iWidth;