Merge branch 'uaf-modify' into 'master'

Prevent a UAF error during the execution of some commands

See merge request irssi/irssi!24

(cherry picked from commit e405330e04dc344797f00c12cf8fd7f63b17e0e4)
This commit is contained in:
Nei 2018-01-03 10:35:58 +00:00 committed by ailin-nemui
parent fe6e377beb
commit 8a5f445544
3 changed files with 3 additions and 3 deletions

View File

@ -278,9 +278,9 @@ static void cmd_channel_add_modify(const char *data, gboolean add)
rec = channel_setup_find(channel, chatnet);
if (rec == NULL) {
if (add == FALSE) {
cmd_params_free(free_arg);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_CHANSETUP_NOT_FOUND, channel, chatnet);
cmd_params_free(free_arg);
return;
}

View File

@ -125,9 +125,9 @@ static void cmd_server_add_modify(const char *data, gboolean add)
if (rec == NULL) {
if (add == FALSE) {
cmd_params_free(free_arg);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_SETUPSERVER_NOT_FOUND, addr, port);
cmd_params_free(free_arg);
return;
}

View File

@ -104,9 +104,9 @@ static void cmd_network_add_modify(const char *data, gboolean add)
rec = ircnet_find(name);
if (rec == NULL) {
if (add == FALSE) {
cmd_params_free(free_arg);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
IRCTXT_NETWORK_NOT_FOUND, name);
cmd_params_free(free_arg);
return;
}