diff options
| author | Nei <ailin.nemui@gmail.com> | 2018-02-13 09:51:22 +0000 |
|---|---|---|
| committer | Nei <ailin.nemui@gmail.com> | 2018-02-13 09:51:22 +0000 |
| commit | b0d9cb33cd9ef9da7c331409e8b7c57a6f3aef3f (patch) | |
| tree | 12d9115e29443fb49a63b1a87dbda34cd500b10a /src/fe-common | |
| parent | c2c879e8c55afcb8a737e4535c8d878407807040 (diff) | |
| parent | 12483c688ae231ce5367d080720c22253855a5ce (diff) | |
| download | irssi-b0d9cb33cd9ef9da7c331409e8b7c57a6f3aef3f.zip | |
Merge branch 'security' into 'master'
Security
See merge request irssi/irssi!34
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/chat-completion.c | 2 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-irc-commands.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c index 7ecdd4a2..d610008f 100644 --- a/src/fe-common/core/chat-completion.c +++ b/src/fe-common/core/chat-completion.c @@ -173,6 +173,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg, { CHANNEL_REC *channel; int own; + g_return_if_fail(nick != NULL); channel = channel_find(server, target); if (channel != NULL) { @@ -185,6 +186,7 @@ static void sig_message_join(SERVER_REC *server, const char *channel, const char *nick, const char *address) { CHANNEL_REC *chanrec; + g_return_if_fail(nick != NULL); chanrec = channel_find(server, channel); if (chanrec != NULL) diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 11a911d2..7a6b17a6 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -345,16 +345,18 @@ static void cmd_ts(const char *data) } typedef struct { - IRC_SERVER_REC *server; + char *server_tag; char *nick; } OPER_PASS_REC; static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec) { - if (*password != '\0') - irc_send_cmdv(rec->server, "OPER %s %s", rec->nick, password); + SERVER_REC *server_rec = server_find_tag(rec->server_tag); + if (*password != '\0' && IS_IRC_SERVER(server_rec)) + irc_send_cmdv((IRC_SERVER_REC *) server_rec, "OPER %s %s", rec->nick, password); g_free(rec->nick); - g_free(rec); + g_free(rec->server_tag); + g_free(rec); } static void cmd_oper(const char *data, IRC_SERVER_REC *server) @@ -374,7 +376,7 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server) OPER_PASS_REC *rec; rec = g_new(OPER_PASS_REC, 1); - rec->server = server; + rec->server_tag = g_strdup(server->tag); rec->nick = g_strdup(*nick != '\0' ? nick : server->nick); format = format_get_text(MODULE_NAME, NULL, server, NULL, |