From c3e69b5b8273a7b261213c4fe2a2d3c25e9a5308 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 May 2023 07:57:36 +0000 Subject: [PATCH 1/3] Fix Heap-buffer-overflow READ in Assimp::ObjFileParser::getFace --- code/AssetLib/Obj/ObjFileParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/AssetLib/Obj/ObjFileParser.cpp b/code/AssetLib/Obj/ObjFileParser.cpp index ed416dc93..38fc0533e 100644 --- a/code/AssetLib/Obj/ObjFileParser.cpp +++ b/code/AssetLib/Obj/ObjFileParser.cpp @@ -456,8 +456,8 @@ void ObjFileParser::getFace(aiPrimitiveType type) { iPos = 0; } else { //OBJ USES 1 Base ARRAYS!!!! - const char *token = &(*m_DataIt); - const int iVal = ::atoi(token); + std::string number(&(*m_DataIt), m_DataItEnd - m_DataIt); + const int iVal(::atoi(number.c_str())); // increment iStep position based off of the sign and # of digits int tmp = iVal; From 4cc70cb73ce5139b406fef1ed1e03ab1148e8174 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 May 2023 14:10:57 +0000 Subject: [PATCH 2/3] Optimize --- code/AssetLib/Obj/ObjFileParser.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/AssetLib/Obj/ObjFileParser.cpp b/code/AssetLib/Obj/ObjFileParser.cpp index 38fc0533e..432023264 100644 --- a/code/AssetLib/Obj/ObjFileParser.cpp +++ b/code/AssetLib/Obj/ObjFileParser.cpp @@ -456,8 +456,16 @@ void ObjFileParser::getFace(aiPrimitiveType type) { iPos = 0; } else { //OBJ USES 1 Base ARRAYS!!!! - std::string number(&(*m_DataIt), m_DataItEnd - m_DataIt); - const int iVal(::atoi(number.c_str())); + int iVal; + auto end = m_DataIt; + while (end < m_DataItEnd && *end != '\0') + ++end; + if (end != m_DataItEnd) { + iVal = ::atoi(&(*m_DataIt)); + } else { + std::string number(&(*m_DataIt), m_DataItEnd - m_DataIt); + iVal = ::atoi(number.c_str()); + } // increment iStep position based off of the sign and # of digits int tmp = iVal; From d3506c24e73b28afd4ef91583bff16a6abc0e138 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 2 Jun 2023 18:57:53 +0200 Subject: [PATCH 3/3] Update ObjFileParser.cpp --- code/AssetLib/Obj/ObjFileParser.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/AssetLib/Obj/ObjFileParser.cpp b/code/AssetLib/Obj/ObjFileParser.cpp index 432023264..ad97a470b 100644 --- a/code/AssetLib/Obj/ObjFileParser.cpp +++ b/code/AssetLib/Obj/ObjFileParser.cpp @@ -458,11 +458,14 @@ void ObjFileParser::getFace(aiPrimitiveType type) { //OBJ USES 1 Base ARRAYS!!!! int iVal; auto end = m_DataIt; + // find either the buffer end or the '\0' while (end < m_DataItEnd && *end != '\0') ++end; + // avoid temporary string allocation if there is a zero if (end != m_DataItEnd) { iVal = ::atoi(&(*m_DataIt)); } else { + // otherwise make a zero terminated copy, which is safe to pass to atoi std::string number(&(*m_DataIt), m_DataItEnd - m_DataIt); iVal = ::atoi(number.c_str()); }