From f6cca3de4e7e2480b3e6a4845ff5211b9b24296d Mon Sep 17 00:00:00 2001 From: Joseph Bisch Date: Tue, 24 Sep 2019 21:35:40 -0400 Subject: [PATCH 1/2] Properly free sasl_buffer GString --- src/irc/core/irc-servers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 8251c882..e3c856af 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -456,7 +456,9 @@ static void sig_destroyed(IRC_SERVER_REC *server) gslist_free_full(server->cap_queue, (GDestroyNotify) g_free); server->cap_queue = NULL; - g_free_and_null(server->sasl_buffer); + /* was g_free_and_null, but can't use on a GString */ + g_string_free(server->sasl_buffer); + server->sasl_buffer = NULL; /* these are dynamically allocated only if isupport was sent */ g_hash_table_foreach(server->isupport, From ed65499d76daac352d76ae0f30e36f3feb623174 Mon Sep 17 00:00:00 2001 From: Joseph Bisch Date: Thu, 26 Sep 2019 21:51:36 -0400 Subject: [PATCH 2/2] Add missing g_string_free param --- src/irc/core/irc-servers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index e3c856af..fcd9346e 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -457,7 +457,7 @@ static void sig_destroyed(IRC_SERVER_REC *server) server->cap_queue = NULL; /* was g_free_and_null, but can't use on a GString */ - g_string_free(server->sasl_buffer); + g_string_free(server->sasl_buffer, TRUE); server->sasl_buffer = NULL; /* these are dynamically allocated only if isupport was sent */