From: Skywing <skywing@valhallalegends.com>
Date: Fri, 20 Jun 2008 21:19:32 +0000 (-0500)
Subject: Fix double free in silcd.
X-Git-Tag: silc.server.1.1.13^2~2
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=55401f49c984e35e652eb590bdcefa07387ddd44

Fix double free in silcd.
---

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 8040467f..d8d105c5 100644
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -1472,12 +1472,19 @@ SILC_SERVER_CMD_FUNC(kill)
 
     /* Do normal signoff for the destination client */
     sock = remote_client->connection;
+
+    if (sock)
+      silc_packet_stream_ref(sock);
+
     silc_server_remove_from_channels(server, NULL, remote_client,
 				     TRUE, (char *)"Killed", TRUE, TRUE);
     silc_server_free_sock_user_data(server, sock, comment ? comment :
 				    (unsigned char *)"Killed");
-    if (sock)
+    if (sock) {
+      silc_packet_set_context(sock, NULL);
       silc_server_close_connection(server, sock);
+      silc_packet_stream_unref(sock);
+    }
   } else {
     /* Router operator killing */
 
diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index d2fd526c..74ce18ba 100644
--- a/apps/silcd/server_util.c
+++ b/apps/silcd/server_util.c
@@ -1547,8 +1547,17 @@ void silc_server_kill_client(SilcServer server,
   if (remote_client->connection) {
     /* Remove locally conneted client */
     SilcPacketStream sock = remote_client->connection;
+
+    if (sock)
+      silc_packet_stream_ref(sock);
+
     silc_server_free_sock_user_data(server, sock, NULL);
-    silc_server_close_connection(server, sock);
+
+    if (sock) {
+      silc_packet_set_context(sock, NULL);
+      silc_server_close_connection(server, sock);
+      silc_packet_stream_unref(sock);
+    }
   } else {
     /* Update statistics */
     server->stat.clients--;