From a383cb1ff7b2dba7eb846821ce546f35697903b8 Mon Sep 17 00:00:00 2001 From: Qingyou Zhao Date: Fri, 18 Oct 2024 11:41:47 -0700 Subject: [PATCH] Fix a bug in the assbin loader that reads uninitialized memory (#5801) * Fix a bug in the assbin loader that reads uninitialized memory * Address review comment --------- Co-authored-by: Kim Kulling --- code/AssetLib/Assbin/AssbinLoader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/AssetLib/Assbin/AssbinLoader.cpp b/code/AssetLib/Assbin/AssbinLoader.cpp index d2566a85c7..70e8a06c29 100644 --- a/code/AssetLib/Assbin/AssbinLoader.cpp +++ b/code/AssetLib/Assbin/AssbinLoader.cpp @@ -91,9 +91,13 @@ bool AssbinImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, boo } char s[32]; - in->Read(s, sizeof(char), 32); + const size_t read = in->Read(s, sizeof(char), 32); pIOHandler->Close(in); + + if (read < 19) { + return false; + } return strncmp(s, "ASSIMP.binary-dump.", 19) == 0; }