diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-12-03 19:51:00 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-12-03 19:51:00 +0000 |
| commit | 84abc35a81655cfa5b0ea2a2e0d9780da9e0d8f2 (patch) | |
| tree | 46219957ac21bea99af40fe38a5c2524cd32809d | |
| parent | aa3513eaaf44bbdde6f05d605ab5b54fe3f031a5 (diff) | |
| download | irssi-84abc35a81655cfa5b0ea2a2e0d9780da9e0d8f2.zip | |
Fixed a memory leak and a crash when notifylist_check_join() was called with NULL realname.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2185 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/irc/notifylist/notify-ison.c | 3 | ||||
| -rw-r--r-- | src/irc/notifylist/notifylist.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index 7d22f21c..2de398a1 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -176,7 +176,7 @@ static void whois_send(IRC_SERVER_REC *server, const char *nicks, for (p = str+strlen(nicks)+1; *p != '\0'; p++) if (*p == ',') *p = ' '; - server_redirect_event(server, "whois", 1, str, FALSE, + server_redirect_event(server, "whois", 1, str, TRUE, "notifylist event whois end", "event 318", "notifylist event whois end", "event 311", "notifylist event whois", @@ -285,7 +285,6 @@ static void ison_check_parts(IRC_SERVER_REC *server) continue; notifylist_left(server, rec); - notify_nick_destroy(rec); } } diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c index 0d2b5c21..39806769 100644 --- a/src/irc/notifylist/notifylist.c +++ b/src/irc/notifylist/notifylist.c @@ -232,6 +232,8 @@ void notifylist_left(IRC_SERVER_REC *server, NOTIFY_NICK_REC *rec) rec->user, rec->host, rec->realname, rec->awaymsg); } + + notify_nick_destroy(rec); } static void notifylist_idle_reset(IRC_SERVER_REC *server, const char *nick) @@ -297,7 +299,7 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick, g_free_not_null(rec->realname); rec->user = g_strdup(user); rec->host = g_strdup(host); - rec->realname = *realname == '\0' ? NULL : g_strdup(realname); + rec->realname = realname == NULL || *realname == '\0' ? NULL : g_strdup(realname); if (away != -1) rec->away = away; rec->host_ok = TRUE; |