Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hardening aiString deserialization in AssbinLoader to prevent stack b… (#6606)

Browse Source 
* Hardening aiString deserialization in AssbinLoader to prevent stack buffer overflow

* Simplify string read error handling in AssbinLoader

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
This commit is contained in:
uwezkhan
2026-04-28 18:14:07 +05:30
committed by GitHub
parent fb9a58735d
commit 86ae4876fb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/AssetLib/Assbin/AssbinLoader.cpp
View File

@@ -149,11 +149,18 @@ aiQuaternion Read<aiQuaternion>(IOStream *stream) {
template <> template <>
aiString Read<aiString>(IOStream *stream) { aiString Read<aiString>(IOStream *stream) {
aiString s; aiString s;
stream->Read(&s.length, 4, 1); uint32_t len;
if (s.length) { if (stream->Read(&len, 4, 1) != 1) {
stream->Read(s.data, s.length, 1); throw DeadlyImportError("ASSBIN: Unexpected EOF reading string length");
} }
s.data[s.length] = 0; if (len >= AI_MAXLEN) {
throw DeadlyImportError("ASSBIN: String length too large, potential buffer overflow attempt");
}
s.length = len;
if ((s.length > 0) && (stream->Read(s.data, s.length, 1) != 1)) {
throw DeadlyImportError("ASSBIN: Unexpected EOF reading string data");
}
s.data[s.length] = '\0';
return s; return s;
} }