Merge branch 'master' into 1.8.x

This commit is contained in:
Alexey Sokolov
2020-04-20 21:10:39 +01:00
3 changed files with 14 additions and 7 deletions
+4 -4
View File
@@ -294,13 +294,13 @@ CString CString::Escape_n(EEscape eFrom, EEscape eTo) const {
}
if (ch == 0) {
if (!strncasecmp((const char*)&pTmp, "<", 2))
if (!strncasecmp((const char*)&pTmp, "<", 4))
ch = '<';
else if (!strncasecmp((const char*)&pTmp, "&gt;", 2))
else if (!strncasecmp((const char*)&pTmp, "&gt;", 4))
ch = '>';
else if (!strncasecmp((const char*)&pTmp, "&quot;", 4))
else if (!strncasecmp((const char*)&pTmp, "&quot;", 6))
ch = '"';
else if (!strncasecmp((const char*)&pTmp, "&amp;", 3))
else if (!strncasecmp((const char*)&pTmp, "&amp;", 5))
ch = '&';
}