From: Alexander Barton <alex@barton.de>
Date: Thu, 30 May 2013 15:55:48 +0000 (-0700)
Subject: Merge pull request #3 from Cofyc/master
X-Git-Tag: rel-21-rc1~96
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=9d3800fd15a273f23f51c1f1ab3bc75dacf6c589;hp=7ea3864a9369086024a2d541b053963958b19899

Merge pull request #3 from Cofyc/master

irc-info.c: some commands use LINE_LEN as command buffer len
---

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 24d65651..668f5ed6 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -298,7 +298,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
 static bool
 IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 {
-	char str[LINE_LEN + 1];
+	char str[COMMAND_LEN];
 	CL2CHAN *cl2chan;
 	CHANNEL *chan;
 
@@ -347,7 +347,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				    str, sizeof(str));
 		strlcat(str, Channel_Name(chan), sizeof(str));
 
-		if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) {
+		if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {
 			/* Line becomes too long: send it! */
 			if (!IRC_WriteStrClient(Client, "%s", str))
 				return DISCONNECTED;
@@ -838,7 +838,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
 				strlcat(rpl, " ", sizeof(rpl));
 			strlcat(rpl, Client_ID(c), sizeof(rpl));
 
-			if (strlen(rpl) > LINE_LEN - CLIENT_NICK_LEN - 4) {
+			if (strlen(rpl) > COMMAND_LEN - CLIENT_NICK_LEN - 4) {
 				/* Line is gwoing too long, send now */
 				if (!IRC_WriteStrClient(from, "%s", rpl))
 					return DISCONNECTED;
@@ -1501,7 +1501,7 @@ GLOBAL bool
 IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 {
 	bool is_visible, is_member;
-	char str[LINE_LEN + 1];
+	char str[COMMAND_LEN];
 	CL2CHAN *cl2chan;
 	CLIENT *cl;
 
@@ -1540,7 +1540,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 					    str, sizeof(str));
 			strlcat(str, Client_ID(cl), sizeof(str));
 
-			if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {
+			if (strlen(str) > (COMMAND_LEN - CLIENT_NICK_LEN - 4)) {
 				if (!IRC_WriteStrClient(Client, "%s", str))
 					return DISCONNECTED;
 				snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,