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

Merge pull request #1461 from jfaust/master 

Fix possible infinite loop when exporting to gltf2
pull/1462/head^2
Kim Kulling 2017-09-28 21:21:56 +02:00 committed by GitHub
parent b1410f8455 febd611d48
commit 87546ec54c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/glTF2Asset.inl
View File

@ -1118,11 +1118,12 @@ inline std::string Asset::FindUniqueID(const std::string& str, const char* suffi
if (it == mUsedIds.end()) if (it == mUsedIds.end())
return id; return id;
char buffer[256]; std::vector<char> buffer;
int offset = ai_snprintf(buffer, sizeof(buffer), "%s_", id.c_str()); buffer.resize(id.size() + 16);
int offset = ai_snprintf(buffer.data(), buffer.size(), "%s_", id.c_str());
for (int i = 0; it != mUsedIds.end(); ++i) { for (int i = 0; it != mUsedIds.end(); ++i) {
ai_snprintf(buffer + offset, sizeof(buffer) - offset, "%d", i); ai_snprintf(buffer.data() + offset, buffer.size() - offset, "%d", i);
id = buffer; id = buffer.data();
it = mUsedIds.find(id); it = mUsedIds.find(id);
} }