Fix double free in silcd.

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 8040467f6af703b3c57d7813dc75a63f49b78f3d..d8d105c535a76a72de9518fe9c1853fe17c48765 100644 (file)
--- 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;
 
     /* 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");
     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_server_close_connection(server, sock);

+      silc_packet_stream_unref(sock);
+    }

   } else {
     /* Router operator killing */
 
   } else {
     /* Router operator killing */
 

diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index d2fd526caf5691f95d58539f2505086ed0d6f904..74ce18ba2902866107148517f3f961fe645dd714 100644 (file)
--- 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 (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_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--;
   } else {
     /* Update statistics */
     server->stat.clients--;