repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 7dba1a0766b35d01cd8892753d1e0dd578ca2cd9:
path_to: 
revision_to: 

commit 7dba1a0766b35d01cd8892753d1e0dd578ca2cd9
Author: Alexander Barton 
Date:   Thu Jan 7 01:54:11 2016 +0100

    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  for spotting the issue!

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c

--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -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++) {
diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e

--- a/src/testsuite/message-test.e
+++ b/src/testsuite/message-test.e
@@ -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 }

-----END OF PAGE-----