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

Optimize the check

pull/4282/head
Kim Kulling 2021-12-22 20:43:44 +01:00 committed by GitHub
parent 215f4e1f4d
commit 2c66d4d3a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Common/BaseImporter.cpp
View File

@ -372,16 +372,14 @@ void BaseImporter::ConvertToUTF8(std::vector<char> &data) {
} }
// UTF 16 BE with BOM // UTF 16 BE with BOM
size_t index = 0;
if (*((uint16_t *)&data.front()) == 0xFFFE) { if (*((uint16_t *)&data.front()) == 0xFFFE) {
// Check to ensure no overflow can happen
if(data.size() % 2 != 0) {
return;
}
// swap the endianness .. // swap the endianness ..
for (uint16_t *p = (uint16_t *)&data.front(), *end = (uint16_t *)&data.back(); p <= end; ++p) { for (uint16_t *p = (uint16_t *)&data.front(), *end = (uint16_t *)&data.back(); p <= end; ++p) {
// Check to ensure no overflow can happen ByteSwap::Swap2(p);
if ((index+2) < data.size()) {
// Swap the data
ByteSwap::Swap2(p);
index += 2;
}
} }
} }