From d1eeb80e1a7f2ff4b585e0911c000e64f508bb84 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 12 Apr 2021 21:05:46 +0200 Subject: [PATCH 1/2] Not resize empty vectors. closes https://github.com/assimp/assimp/issues/3754 --- include/assimp/XmlParser.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/assimp/XmlParser.h b/include/assimp/XmlParser.h index 2f123c54a..ba1f040d6 100644 --- a/include/assimp/XmlParser.h +++ b/include/assimp/XmlParser.h @@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { +/// @brief Will find a node by its name. struct find_node_by_name_predicate { std::string mName; find_node_by_name_predicate(const std::string &name) : @@ -88,7 +89,11 @@ public: } void clear() { - mData.resize(0); + if(mData.empty() { + mDoc = nullptr; + return; + } + mData.clear(); delete mDoc; mDoc = nullptr; } From a6e4672df1f393b72419269dd1f4419ecdd2b06c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 12 Apr 2021 23:19:00 +0200 Subject: [PATCH 2/2] Fix a typo. --- include/assimp/XmlParser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/XmlParser.h b/include/assimp/XmlParser.h index ba1f040d6..15c4ff9ff 100644 --- a/include/assimp/XmlParser.h +++ b/include/assimp/XmlParser.h @@ -89,7 +89,7 @@ public: } void clear() { - if(mData.empty() { + if(mData.empty()) { mDoc = nullptr; return; }