9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ircd: use correct buffer sizes

Browse source 
This fixes an issue with truncated SJOINs.
This commit is contained in:
Simon Arlott 2018-01-18 21:33:26 +00:00
parent e081bf2988
commit acd941bfed
No known key found for this signature in database
GPG key ID: 49BFFEEFD4C3ED53
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ircd/s_serv.c
View file

@ -57,7 +57,7 @@ int MaxConnectionCount = 1;
int MaxClientCount = 1; int MaxClientCount = 1;
int refresh_user_links = 0; int refresh_user_links = 0;
static char buf[EXT_BUFSIZE]; static char buf[BUFSIZE];
/* /*
* list of recognized server capabilities. "TS" is not on the list * list of recognized server capabilities. "TS" is not on the list
@ -504,7 +504,7 @@ burst_ban(struct Client *client_p)
* to other servers, so rewrite to our server * to other servers, so rewrite to our server
* name. * name.
*/ */
rb_strlcpy(operbuf, aconf->info.oper, sizeof buf); rb_strlcpy(operbuf, aconf->info.oper, sizeof operbuf);
p = strrchr(operbuf, '{'); p = strrchr(operbuf, '{');
if (p != NULL && if (p != NULL &&
operbuf + sizeof operbuf - p > (ptrdiff_t)(melen + 2)) operbuf + sizeof operbuf - p > (ptrdiff_t)(melen + 2))
@ -557,7 +557,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
tlen = strlen(banptr->banstr) + (banptr->forward ? strlen(banptr->forward) + 1 : 0) + 1; tlen = strlen(banptr->banstr) + (banptr->forward ? strlen(banptr->forward) + 1 : 0) + 1;
/* uh oh */ /* uh oh */
if(cur_len + tlen > EXT_BUFSIZE - 3) if(cur_len + tlen > BUFSIZE - 3)
{ {
/* the one we're trying to send doesnt fit at all! */ /* the one we're trying to send doesnt fit at all! */
if(cur_len == mlen) if(cur_len == mlen)
@ -599,7 +599,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
static void static void
burst_TS6(struct Client *client_p) burst_TS6(struct Client *client_p)
{ {
char ubuf[EXT_BUFSIZE]; char ubuf[BUFSIZE];
struct Client *target_p; struct Client *target_p;
struct Channel *chptr; struct Channel *chptr;
struct membership *msptr; struct membership *msptr;
@ -696,7 +696,7 @@ burst_TS6(struct Client *client_p)
if(is_voiced(msptr)) if(is_voiced(msptr))
tlen++; tlen++;
if(cur_len + tlen >= EXT_BUFSIZE - 3) if(cur_len + tlen >= BUFSIZE - 3)
{ {
*(t-1) = '\0'; *(t-1) = '\0';
sendto_one(client_p, "%s", buf); sendto_one(client_p, "%s", buf);
@ -762,7 +762,7 @@ burst_TS6(struct Client *client_p)
const char * const char *
show_capabilities(struct Client *target_p) show_capabilities(struct Client *target_p)
{ {
static char msgbuf[EXT_BUFSIZE]; static char msgbuf[BUFSIZE];
*msgbuf = '\0'; *msgbuf = '\0';