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

BUGFIX: Fix correct handling of erroreous models (invalid token will now not cause a crash) 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@122 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2008-09-07 20:50:51 +00:00
parent f69446937b
commit d38e83766b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/ObjFileParser.cpp
View File

@ -428,6 +428,8 @@ void ObjFileParser::getNewMaterial()
{ {
m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd); m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd);
m_DataIt = getNextWord<DataArrayIt>(m_DataIt, m_DataItEnd); m_DataIt = getNextWord<DataArrayIt>(m_DataIt, m_DataItEnd);
if ( m_DataIt == m_DataItEnd )
return;
char *pStart = &(*m_DataIt); char *pStart = &(*m_DataIt);
std::string strMat(pStart, *m_DataIt); std::string strMat(pStart, *m_DataIt);
@ -476,6 +478,8 @@ void ObjFileParser::getGroupName()
// Get next word from data buffer // Get next word from data buffer
m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd); m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd);
m_DataIt = getNextWord<DataArrayIt>(m_DataIt, m_DataItEnd); m_DataIt = getNextWord<DataArrayIt>(m_DataIt, m_DataItEnd);
if ( m_DataIt == m_DataItEnd )
return;
// Store groupname in group library // Store groupname in group library
char *pStart = &(*m_DataIt); char *pStart = &(*m_DataIt);
@ -587,9 +591,11 @@ void ObjFileParser::extractExtension(const std::string &strFile,
if (strFile.empty()) if (strFile.empty())
return; return;
// Search for extention delimiter
std::string::size_type pos = strFile.find_last_of("."); std::string::size_type pos = strFile.find_last_of(".");
if ( pos == std::string::npos ) if ( pos == std::string::npos )
return; return;
strExt = strFile.substr(pos, strFile.size() - pos); strExt = strFile.substr(pos, strFile.size() - pos);
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------