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

m_cap: Fix CAP LS generation

Browse source 
The `caplen` variable was unused, so the cap to be output wasn't considered
when determining whether or not it would fit.
This commit is contained in:
Simon Arlott 2017-07-29 22:15:27 +01:00
parent 2100c58d09
commit b6f271b2aa
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/m_cap.c
View file

@ -154,12 +154,12 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags)
{ {
char buf[BUFSIZE] = { 0 }; char buf[BUFSIZE] = { 0 };
char capbuf[BUFSIZE] = { 0 }; char capbuf[BUFSIZE] = { 0 };
int buflen = 0; int capbuflen = 0;
int mlen; int buflen;
struct CapabilityEntry *entry; struct CapabilityEntry *entry;
rb_dictionary_iter iter; rb_dictionary_iter iter;
mlen = snprintf(buf, sizeof buf, ":%s CAP %s %s", buflen = snprintf(buf, sizeof buf, ":%s CAP %s %s",
me.name, me.name,
EmptyString(source_p->name) ? "*" : source_p->name, EmptyString(source_p->name) ? "*" : source_p->name,
subcmd); subcmd);
@ -188,28 +188,27 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags)
data = clicap->data(source_p); data = clicap->data(source_p);
if (data != NULL) if (data != NULL)
caplen += strlen(data) + 1; caplen += strlen(data) + 1 /* "=" between cap and data */;
/* \r\n\0, possible "-~=", space, " *" */ /* "<buf> * :<capbuf>-~=<cap><=><data> " */
if(buflen + mlen >= BUFSIZE - 10) if(buflen + 4 + capbuflen + 3 + caplen + 1 > DATALEN)
{ {
/* remove our trailing space -- if buflen == mlen /* remove our trailing space -- if capbuflen == 0
* here, we didnt even succeed in adding one. * here, we didnt even succeed in adding one.
*/ */
capbuf[buflen] = '\0'; capbuf[capbuflen] = '\0';
sendto_one(source_p, "%s * :%s", buf, capbuf); sendto_one(source_p, "%s * :%s", buf, capbuf);
buflen = mlen;
memset(capbuf, 0, sizeof capbuf); memset(capbuf, 0, sizeof capbuf);
} }
buflen = rb_snprintf_append(capbuf, sizeof capbuf, "%s%s%s ", capbuflen = rb_snprintf_append(capbuf, sizeof capbuf, "%s%s%s ",
entry->cap, data != NULL ? "=" : "", data != NULL ? data : ""); entry->cap, data != NULL ? "=" : "", data != NULL ? data : "");
} }
/* remove trailing space */ /* remove trailing space */
capbuf[buflen] = '\0'; capbuf[capbuflen] = '\0';
sendto_one(source_p, "%s :%s", buf, capbuf); sendto_one(source_p, "%s :%s", buf, capbuf);
} }