Fix poor performance of hex XML entities

Closes #2245 Closes #2269
2016-09-11 12:54:51 -04:00 · 2016-09-11 12:54:51 -04:00 · 27216901d4
parent 8e9e8c04cd
commit 27216901d4
1 changed files with 3 additions and 2 deletions
--- a/PowerEditor/src/TinyXml/tinyxmlparser.cpp
+++ b/PowerEditor/src/TinyXml/tinyxmlparser.cpp
@ -232,8 +232,9 @@ const TCHAR* TiXmlBase::GetEntity( const TCHAR* p, TCHAR* value )
 		const TCHAR* end = generic_strchr(p+3, TEXT(';'));
 		if (end && end - p <= 3 + 4)
 		{
-			int val;
-			if (generic_sscanf(p+3, TEXT("%x"), &val) == 1)
+			TCHAR* hexend;
+			auto val = generic_strtol(p + 3, &hexend, 16);
+			if (hexend == end)
 			{
 				*value = static_cast<TCHAR>(val);
 				return end + 1;