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

filter: use a static buffer instead of strdup

Browse source
This commit is contained in:
Ed Kellett 2018-08-10 21:52:03 +01:00
parent fc7fbe6d20
commit f982238e91
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/filter.c
View file

@ -291,6 +291,7 @@ unsigned match_message(const char *msg)
} }
static char check_buffer[2000]; static char check_buffer[2000];
static char clean_buffer[BUFSIZE];
void void
filter_msg_user(void *data_) filter_msg_user(void *data_)
@ -307,7 +308,7 @@ filter_msg_user(void *data_)
if (IsOper(s) || IsOper(data->target_p)) { if (IsOper(s) || IsOper(data->target_p)) {
return; return;
} }
char *text = rb_strdup(data->text); char *text = strcpy(clean_buffer, data->text);
strip_colour(text); strip_colour(text);
strip_unprintable(text); strip_unprintable(text);
snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s 0 :%s", snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s 0 :%s",
@ -330,7 +331,6 @@ filter_msg_user(void *data_)
cmdname[data->msgtype], cmdname[data->msgtype],
text); text);
unsigned r = match_message(check_buffer); unsigned r = match_message(check_buffer);
rb_free(text);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), form_str(ERR_CANNOTSENDTOCHAN),
@ -362,7 +362,7 @@ filter_msg_channel(void *data_)
if (IsOper(s)) { if (IsOper(s)) {
return; return;
} }
char *text = rb_strdup(data->text); char *text = strcpy(clean_buffer, data->text);
strip_colour(text); strip_colour(text);
strip_unprintable(text); strip_unprintable(text);
snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s %s :%s", snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s %s :%s",
@ -386,7 +386,6 @@ filter_msg_channel(void *data_)
data->chptr->chname, data->chptr->chname,
text); text);
unsigned r = match_message(check_buffer); unsigned r = match_message(check_buffer);
rb_free(text);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), form_str(ERR_CANNOTSENDTOCHAN),