Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #523 from turol/afl-fixes

Browse Source 
More crash fixes
This commit is contained in:
Kim Kulling
2015-06-22 16:56:51 +02:00
parent 71cc64238a 681c32d5ec
commit 85e2f47dc8
6 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/MD3Loader.cpp
View File

@@ -478,6 +478,9 @@ void MD3Importer::ReadSkin(Q3Shader::SkinData& fill) const
std::string::size_type s = filename.find_last_of('_');
if (s == std::string::npos) {
s = filename.find_last_of('.');
if (s == std::string::npos) {
s = filename.size();
}
}
ai_assert(s != std::string::npos);
@@ -539,7 +542,9 @@ bool MD3Importer::ReadMultipartFile()
{
// check whether the file name contains a common postfix, e.g lower_2.md3
std::string::size_type s = filename.find_last_of('_'), t = filename.find_last_of('.');
ai_assert(t != std::string::npos);
if (t == std::string::npos)
t = filename.size();
if (s == std::string::npos)
s = t;