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

Merge pull request #3504 from Neil-Clifford-FB/fbxparser-overead 

FBXParser.cpp - handle buffer over-read correctly
pull/3487/head^2
Kim Kulling 2020-11-25 11:30:52 +01:00 committed by GitHub
parent afd69bea8a c059e58c5e
commit dc9db3eaf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
code/AssetLib/FBX/FBXParser.cpp
View File

@ -641,7 +641,11 @@ void ParseVectorDataArray(std::vector<aiVector3D>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * (type == 'd' ? 8 : 4)); uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
const uint32_t count3 = count / 3; const uint32_t count3 = count / 3;
out.reserve(count3); out.reserve(count3);
@ -728,7 +732,11 @@ void ParseVectorDataArray(std::vector<aiColor4D>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * (type == 'd' ? 8 : 4)); uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
const uint32_t count4 = count / 4; const uint32_t count4 = count / 4;
out.reserve(count4); out.reserve(count4);
@ -807,7 +815,11 @@ void ParseVectorDataArray(std::vector<aiVector2D>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * (type == 'd' ? 8 : 4)); uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
const uint32_t count2 = count / 2; const uint32_t count2 = count / 2;
out.reserve(count2); out.reserve(count2);
@ -879,7 +891,11 @@ void ParseVectorDataArray(std::vector<int>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * 4); uint64_t dataToRead = static_cast<uint64_t>(count) * 4;
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
out.reserve(count); out.reserve(count);
@ -937,7 +953,11 @@ void ParseVectorDataArray(std::vector<float>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * (type == 'd' ? 8 : 4)); uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
if (type == 'd') { if (type == 'd') {
const double* d = reinterpret_cast<const double*>(&buff[0]); const double* d = reinterpret_cast<const double*>(&buff[0]);
@ -998,7 +1018,11 @@ void ParseVectorDataArray(std::vector<unsigned int>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * 4); uint64_t dataToRead = static_cast<uint64_t>(count) * 4;
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
out.reserve(count); out.reserve(count);
@ -1063,7 +1087,11 @@ void ParseVectorDataArray(std::vector<uint64_t>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * 8); uint64_t dataToRead = static_cast<uint64_t>(count) * 8;
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
out.reserve(count); out.reserve(count);
@ -1121,7 +1149,11 @@ void ParseVectorDataArray(std::vector<int64_t>& out, const Element& el)
ReadBinaryDataArray(type, count, data, end, buff, el); ReadBinaryDataArray(type, count, data, end, buff, el);
ai_assert(data == end); ai_assert(data == end);
ai_assert(buff.size() == count * 8); uint64_t dataToRead = static_cast<uint64_t>(count) * 8;
ai_assert(buff.size() == dataToRead);
if (dataToRead > buff.size()) {
ParseError("Invalid read size (binary)",&el);
}
out.reserve(count); out.reserve(count);