1
0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-04 22:19:57 +00:00

Send_Message: Fix handling of "empty" targets

Clients can specify multiple targets for the "PRIVMSG", "NOTICE", and
"SQUERY" commands, separated by commas (e. g. "PRIVMSG a,#b,c :text").

Since commit 49ab79d0 ("Limit the number of message targes, and suppress
duplicates"), ngIRCd crashed when the client sent the separator character
only as target(s), e. g. "," or ",,,," etc.!

This patch fixes the bug and adds a test case for this issue.

Thanks to Florian Westphal <fw@strlen.de> for spotting the issue!
This commit is contained in:
Alexander Barton 2016-01-07 01:54:11 +01:00
parent 055d6e8056
commit 7dba1a0766
2 changed files with 14 additions and 1 deletions

View File

@ -563,7 +563,9 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
currentTarget = strtok_r(currentTarget, ",", &strtok_last);
ngt_UpperStr(Req->command);
while (true) {
/* Please note that "currentTarget" is NULL when the target contains
* the separator character only, e. g. "," or ",,,," etc.! */
while (currentTarget) {
/* Make sure that there hasn't been such a target already: */
targets[target_nr++] = currentTarget;
for(i = 0; i < target_nr - 1; i++) {

View File

@ -38,6 +38,17 @@ expect {
"@* PRIVMSG nick :test"
}
send "privmsg ,,,, :dummy\r"
send "privmsg ,,,nick,,&server,,, :test\r"
expect {
timeout { exit 1 }
"@* PRIVMSG nick :test"
}
expect {
timeout { exit 1 }
"404"
}
send "privmsg Nick,#testChannel,nick :test\r"
expect {
timeout { exit 1 }