From 485aa8b39d160d9e2fb43bb468b3d08cc0234453 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 12 Sep 2014 19:37:10 -0700 Subject: [PATCH] Fix null check in Q3BSPFileImporter Reverse the null condition, preventing invalid texture stream dereferencing. Fixes #380. --- code/Q3BSPFileImporter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index b662be299..c7b829843 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -641,17 +641,17 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode bool res = true; sQ3BSPTexture *pTexture = pModel->m_Textures[ textureId ]; if ( !pTexture ) { - return false; - } + return false; + } - std::vector supportedExtensions; - supportedExtensions.push_back( ".jpg" ); - supportedExtensions.push_back( ".png" ); - supportedExtensions.push_back( ".tga" ); + std::vector supportedExtensions; + supportedExtensions.push_back( ".jpg" ); + supportedExtensions.push_back( ".png" ); + supportedExtensions.push_back( ".tga" ); std::string textureName, ext; if ( expandFile( pArchive, pTexture->strName, supportedExtensions, textureName, ext ) ) { IOStream *pTextureStream = pArchive->Open( textureName.c_str() ); - if ( !pTextureStream ) { + if ( pTextureStream ) { size_t texSize = pTextureStream->FileSize(); aiTexture *pTexture = new aiTexture; pTexture->mHeight = 0;