iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from jabberwock/fix/getparamscolon-bounds-check

Browse Source 
Message: add bounds check in GetParamsColon when uIdx >= params.size()
This commit is contained in:
Alexey Sokolov
2026-03-17 18:05:39 +00:00
committed by GitHub
parent 55d34645de 20908fc2d1
commit 8566db72dd
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Message.cpp
View File

@@ -51,7 +51,7 @@ void CMessage::SetCommand(const CString& sCommand) {
} }
CString CMessage::GetParamsColon(unsigned int uIdx, unsigned int uLen) const { CString CMessage::GetParamsColon(unsigned int uIdx, unsigned int uLen) const {
if (m_vsParams.empty() || uLen == 0) { if (m_vsParams.empty() || uLen == 0 || uIdx >= m_vsParams.size()) {
return ""; return "";
} }
if (uLen > m_vsParams.size() - uIdx - 1) { if (uLen > m_vsParams.size() - uIdx - 1) {

34
test/MessageTest.cpp
View File

@@ -72,6 +72,40 @@ TEST(MessageTest, GetParams) {
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParams(-1, 10), ""); EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParams(-1, 10), "");
} }
TEST(MessageTest, GetParamsColon) {
EXPECT_EQ(CMessage("CMD").GetParamsColon(0), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(1), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(-1), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(0, 0), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(1, 0), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(-1, 0), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(0, 1), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(1, 1), "");
EXPECT_EQ(CMessage("CMD").GetParamsColon(-1, 1), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(0), "p1 :p2 p3");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(1), ":p2 p3");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(-1), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(0, 0), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(1, 0), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(-1, 0), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(0, 1), "p1");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(1, 1), ":p2 p3");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(-1, 1), "");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(0, 10), "p1 :p2 p3");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(1, 10), ":p2 p3");
EXPECT_EQ(CMessage("CMD p1 :p2 p3").GetParamsColon(-1, 10), "");
// uIdx past the end must return "" without undefined behaviour (#1994)
EXPECT_EQ(CMessage("MODE #chan +b").GetParamsColon(2, 1), "");
EXPECT_EQ(CMessage("MODE #chan +b").GetParamsColon(3, 1), "");
}
TEST(MessageTest, GetParamsSplit) { TEST(MessageTest, GetParamsSplit) {
EXPECT_THAT(CMessage("CMD").GetParamsSplit(0), IsEmpty()); EXPECT_THAT(CMessage("CMD").GetParamsSplit(0), IsEmpty());
EXPECT_THAT(CMessage("CMD").GetParamsSplit(1), IsEmpty()); EXPECT_THAT(CMessage("CMD").GetParamsSplit(1), IsEmpty());