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

merge with git://github.com/tonttu/assimp.git

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2011-06-09 14:29:32 +00:00
parent 2de55ee880
commit 9edc0a9b8e
56 changed files with 178 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/XFileParser.cpp
View File

@@ -1060,7 +1060,7 @@ std::string XFileParser::GetNextToken()
// name token
if( End - P < 4) return s;
len = ReadBinDWord();
if( End - P < len) return s;
if( End - P < int(len)) return s;
s = std::string(P, len);
P += len;
return s;
@@ -1068,7 +1068,7 @@ std::string XFileParser::GetNextToken()
// string token
if( End - P < 4) return s;
len = ReadBinDWord();
if( End - P < len) return s;
if( End - P < int(len)) return s;
s = std::string(P, len);
P += (len + 2);
return s;