adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-04 00:41:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'htmlstring'

Browse Source
This commit is contained in:
Alexey Sokolov
2020-04-20 20:51:25 +01:00
parent 37eb36ade8 e801c49740
commit 3d7fe3e436
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZNCString.cpp
+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 = '&';
}
test/StringTest.cpp
+4 -2
View File
@@ -53,6 +53,8 @@ TEST_F(EscapeTest, Test) {
testString("&<>", "%26%3C%3E", "&amp;&lt;&gt;", "&<>", "&<>");
testString(" ;", "+%3B", " ;", " ;", "\\s\\:");
// clang-format on
EXPECT_EQ(CString("a&lt.b&gt;c").Escape_n(CString::EHTML, CString::EASCII),
"a&lt.b>c");
}
TEST(StringTest, Bool) {
@@ -199,8 +201,8 @@ TEST(StringTest, Equals) {
TEST(StringTest, Find) {
EXPECT_EQ(CString("Hello, I'm Bob").Find("Hello"), 0u);
EXPECT_EQ(
CString("Hello, I'm Bob").Find("Hello", CString::CaseInsensitive), 0u);
EXPECT_EQ(CString("Hello, I'm Bob").Find("Hello", CString::CaseInsensitive),
0u);
EXPECT_EQ(CString("Hello, I'm Bob").Find("Hello", CString::CaseSensitive),
0u);