Ticket #3581: mc-3581-sftp-fix-connection-memleaks.patch

src/vfs/sftpfs/connection.c

@@ -170 +170 @@
     super_data->auth_type = NONE;
 
     /* check what authentication methods are available */
+    /* userauthlist is internally managed by libssh2 and
+       freed by libssh2_session_free() */
     userauthlist = libssh2_userauth_list (super_data->session, super->path_element->user,
                                           strlen (super->path_element->user));
 
@@ -183 +185 @@
 
     if ((super_data->config_auth_type & AGENT) != 0)
         super_data->auth_type |= AGENT;
-
-    g_free (userauthlist);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -368 +368 @@
 
     super_data = (sftpfs_super_data_t *) super->data;
 
-    /* Create a session instance */
-    super_data->session = libssh2_session_init ();
-    if (super_data->session == NULL)
-        return (-1);
+    super_data->session = NULL;
+    super_data->agent = NULL;
+    super_data->sftp_session = NULL;
 
     /*
      * The application code is responsible for creating the socket
@@ -381 +380 @@
     if (super_data->socket_handle == -1)
         return (-1);
 
+    /* Create a session instance */
+    super_data->session = libssh2_session_init ();
+    if (super_data->session == NULL)
+        return (-1);
+
     /* ... start it up. This will trade welcome banners, exchange keys,
      * and setup crypto, compression, and MAC layers
      */
+    /* FIXME: Starting in libssh2 version 1.2.8  this function is considered deprecated.
+       Use libssh2_session_handshake instead. */
     rc = libssh2_session_startup (super_data->session, super_data->socket_handle);
     if (rc != 0)
     {
@@ -430 +436 @@
 {
     sftpfs_super_data_t *super_data;
 
-    mc_return_if_error (mcerror);
+    /* no mc_return_*_if_error() here because of abort open_connection handling too */
+    (void) mcerror;
 
     super_data = (sftpfs_super_data_t *) super->data;
     if (super_data == NULL)
         return;
 
-    vfs_path_element_free (super_data->original_connection_info);
-    super_data->original_connection_info = NULL;
+    if (super_data->sftp_session != NULL)
+    {
+        libssh2_sftp_shutdown (super_data->sftp_session);
+        super_data->sftp_session = NULL;
+    }
 
     if (super_data->agent != NULL)
     {
@@ -446 +456 @@
         super_data->agent = NULL;
     }
 
-    if (super_data->sftp_session != NULL)
-    {
-        libssh2_sftp_shutdown (super_data->sftp_session);
-        super_data->sftp_session = NULL;
-    }
+    super_data->fingerprint = NULL;
 
     if (super_data->session != NULL)
     {
         libssh2_session_disconnect (super_data->session, shutdown_message);
+        libssh2_session_free(super_data->session);
         super_data->session = NULL;
     }
 
-    super_data->fingerprint = NULL;
-
     if (super_data->socket_handle != -1)
     {
         close (super_data->socket_handle);

src/vfs/sftpfs/vfs_subclass.c

@@ -137 +137 @@
 sftpfs_cb_close_connection (struct vfs_class *me, struct vfs_s_super *super)
 {
     GError *mcerror = NULL;
+    sftpfs_super_data_t *sftpfs_super_data;
 
     (void) me;
     sftpfs_close_connection (super, "Normal Shutdown", &mcerror);
     mc_error_message (&mcerror, NULL);
+
+    sftpfs_super_data = (sftpfs_super_data_t *) super->data;
+    if (sftpfs_super_data != NULL)
+        vfs_path_element_free (sftpfs_super_data->original_connection_info);
+
     g_free (super->data);
 }