mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-26 03:27:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3 from Cofyc/master

Browse Source 
irc-info.c: some commands use LINE_LEN as command buffer len
This commit is contained in:
Alexander Barton
2013-05-30 08:55:48 -07:00
parent 7ea3864a93 4f525d39d4
commit 9d3800fd15
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ngircd/irc-info.c
View File

@@ -298,7 +298,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
static bool static bool
IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
{ {
char str[LINE_LEN + 1]; char str[COMMAND_LEN];
CL2CHAN *cl2chan; CL2CHAN *cl2chan;
CHANNEL *chan; CHANNEL *chan;
@@ -347,7 +347,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
str, sizeof(str)); str, sizeof(str));
strlcat(str, Channel_Name(chan), 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! */ /* Line becomes too long: send it! */
if (!IRC_WriteStrClient(Client, "%s", str)) if (!IRC_WriteStrClient(Client, "%s", str))
return DISCONNECTED; return DISCONNECTED;
@@ -838,7 +838,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
strlcat(rpl, " ", sizeof(rpl)); strlcat(rpl, " ", sizeof(rpl));
strlcat(rpl, Client_ID(c), 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 */ /* Line is gwoing too long, send now */
if (!IRC_WriteStrClient(from, "%s", rpl)) if (!IRC_WriteStrClient(from, "%s", rpl))
return DISCONNECTED; return DISCONNECTED;
@@ -1501,7 +1501,7 @@ GLOBAL bool
IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
{ {
bool is_visible, is_member; bool is_visible, is_member;
char str[LINE_LEN + 1]; char str[COMMAND_LEN];
CL2CHAN *cl2chan; CL2CHAN *cl2chan;
CLIENT *cl; CLIENT *cl;
@@ -1540,7 +1540,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
str, sizeof(str)); str, sizeof(str));
strlcat(str, Client_ID(cl), 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)) if (!IRC_WriteStrClient(Client, "%s", str))
return DISCONNECTED; return DISCONNECTED;
snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,