summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2012-12-23 10:51:54 +0100
committerSebastien Helleu <flashcode@flashtux.org>2012-12-23 10:51:54 +0100
commit33f01dcb636b012c4d4dc95bc9d9978d7337dc97 (patch)
tree34e474eea924fe0adca05b9c6b2c9d28e345434d
parent0c15deefc052b62a82e6924b896de397fe4b1449 (diff)
downloadweechat-33f01dcb636b012c4d4dc95bc9d9978d7337dc97.zip
relay: fix crash after /upgrade when a client is connected
-rw-r--r--ChangeLog3
-rw-r--r--src/plugins/relay/relay-client.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fbdc137b5..0c1b25109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-dev, 2012-12-20
+v0.4.0-dev, 2012-12-23
Version 0.4.0 (under dev!)
@@ -82,6 +82,7 @@ Version 0.4.0 (under dev!)
* irc: fix crash when message 352 has too few arguments (bug #37513)
* irc: remove unneeded server disconnect when server buffer is closed and server
is already disconnected
+* relay: fix crash after /upgrade when a client is connected
* relay: add support of IPv6, new option relay.network.ipv6, add support of
"ipv4." and/or "ipv6." before protocol name, to force IPv4/IPv6 (task #12270)
* relay: add missing "ssl." in output of /relay listrelay
diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c
index e50f20f33..7816accd1 100644
--- a/src/plugins/relay/relay-client.c
+++ b/src/plugins/relay/relay-client.c
@@ -786,6 +786,11 @@ relay_client_new_with_infolist (struct t_infolist *infolist)
new_client->id = weechat_infolist_integer (infolist, "id");
new_client->desc = NULL;
new_client->sock = weechat_infolist_integer (infolist, "sock");
+ new_client->ssl = weechat_infolist_integer (infolist, "ssl");
+#ifdef HAVE_GNUTLS
+ new_client->gnutls_sess = NULL;
+ new_client->hook_timer_handshake = NULL;
+#endif
new_client->address = strdup (weechat_infolist_string (infolist, "address"));
new_client->status = weechat_infolist_integer (infolist, "status");
new_client->protocol = weechat_infolist_integer (infolist, "protocol");