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

Merge pull request #455 from turol/master 

Fix some infinite loops
pull/456/head
Alexander Gessler 2015-02-01 12:54:15 +01:00
parent c7785014e4 b93bd167ed
commit 48fa3153c6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/PlyParser.cpp
View File

@ -436,7 +436,7 @@ bool PLY::DOM::ParseHeader (const char* pCur,const char** pCurOut,bool isBinary)
*pCurOut = pCur; *pCurOut = pCur;
// parse all elements // parse all elements
while (true) while ((*pCur) != '\0')
{ {
// skip all comments // skip all comments
PLY::DOM::SkipComments(pCur,&pCur); PLY::DOM::SkipComments(pCur,&pCur);

5
code/STLLoader.cpp
View File

@ -308,6 +308,7 @@ void STLImporter::LoadASCIIFile()
{ {
if (3 == curVertex) { if (3 == curVertex) {
DefaultLogger::get()->error("STL: a facet with more than 3 vertices has been found"); DefaultLogger::get()->error("STL: a facet with more than 3 vertices has been found");
++sz;
} }
else else
{ {
@ -326,8 +327,10 @@ void STLImporter::LoadASCIIFile()
break; break;
} }
// else skip the whole identifier // else skip the whole identifier
else while (!::IsSpaceOrNewLine(*sz)) { else {
do {
++sz; ++sz;
} while (!::IsSpaceOrNewLine(*sz));
} }
} }