From 62cf8296b12cb6698755ef594c1740c9d4643ddd Mon Sep 17 00:00:00 2001
From: cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Tue, 11 Jan 2022 14:45:08 +0000
Subject: [PATCH] Bugfix: XML reader no longer drops last character in strings
 after certain character replacments Due an off-by-one error it went wrong
 where there a special character replacement for the second-last character
 going on. So something like "&lt;X" became "<" instead of "<X".

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6295 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 changes.txt                      | 1 +
 source/Irrlicht/CXMLReaderImpl.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changes.txt b/changes.txt
index 24a01f33..2d9a97d4 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 --------------------------
 Changes in 1.9 (not yet released)
+- Bugfix: XML reader dropped last character in strings if there was a special character replacement for the second-last character.
 - Avoid allocating more than 16k on stack in OCT loader. Also avoid potential heap overwrites in there.
 - obj file loader now allows using mtl files with spaces in the filename. 
   Note that this means it no longer handles obj files which have multiple mtl files behind the mtllib command. 
diff --git a/source/Irrlicht/CXMLReaderImpl.h b/source/Irrlicht/CXMLReaderImpl.h
index 8fb87e17..d2b041b4 100644
--- a/source/Irrlicht/CXMLReaderImpl.h
+++ b/source/Irrlicht/CXMLReaderImpl.h
@@ -549,7 +549,7 @@ private:
 			pos = origstr.findNext(L'&', pos);
 		}
 
-		if (oldPos < (int)origstr.size()-1)
+		if (oldPos < (int)origstr.size())
 			newstr.append(origstr.subString(oldPos, origstr.size()-oldPos));
 
 		return newstr;