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

Add checks for invalid buffer ans size

kimkulling/bug_fix_heap_buffer_overflow_in_readfilefrommemory_issue-5566
Kim Kulling 2024-05-13 08:42:28 +02:00
parent 47dbabadcd
commit fef9fbea7c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/Common/Assimp.cpp
View File

@ -233,8 +233,13 @@ const aiScene *aiImportFileFromMemoryWithProperties(
unsigned int pFlags, unsigned int pFlags,
const char *pHint, const char *pHint,
const aiPropertyStore *props) { const aiPropertyStore *props) {
ai_assert(nullptr != pBuffer); if (pBuffer == nullptr) {
ai_assert(0 != pLength); return nullptr;
}
if (pLength == 0u) {
return nullptr;
}
const aiScene *scene = nullptr; const aiScene *scene = nullptr;
ASSIMP_BEGIN_EXCEPTION_REGION(); ASSIMP_BEGIN_EXCEPTION_REGION();

9
test/unit/AssimpAPITest.cpp
View File

@ -60,3 +60,12 @@ TEST_F( AssimpAPITest, aiGetLastErrorTest ) {
const char *error = aiGetErrorString(); const char *error = aiGetErrorString();
EXPECT_NE(nullptr, error); EXPECT_NE(nullptr, error);
} }
TEST_F(AssimpAPITest, aiImportFileFromMemoryTest) {
const aiScene *scene_null_buffer = aiImportFileFromMemory(nullptr, 0u, 0u, nullptr);
EXPECT_EQ(nullptr, scene_null_buffer);
char buffer[1024] = {'\0'};
const aiScene *scene_null_size = aiImportFileFromMemory(buffer, 0u, 0u, nullptr);
EXPECT_EQ(nullptr, scene_null_size);
}