Commit 6bb9bd8b authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Don't shut down sftp in an error if it was never started.

parent 72175c73

lib/ssh.c

+2 −4
Original line number Diff line number Diff line
@@ -434,6 +434,8 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done) 
  /*

   * At this point we have an authenticated ssh session.

   */

  infof(conn->data, "Authentication complete\n");



  conn->sockfd = sock;

  conn->writesockfd = CURL_SOCKET_BAD;
@@ -478,8 +480,6 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done) 
  if (conn->protocol == PROT_SCP) {

    real_path = (char *)malloc(working_path_len+1);

    if (real_path == NULL) {

      libssh2_sftp_shutdown(ssh->sftp_session);

      ssh->sftp_session = NULL;

      libssh2_session_free(ssh->ssh_session);

      ssh->ssh_session = NULL;

      Curl_safefree(working_path);
@@ -526,8 +526,6 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done) 
    }

  }

  else {

    libssh2_sftp_shutdown(ssh->sftp_session);

    ssh->sftp_session = NULL;

    libssh2_session_free(ssh->ssh_session);

    ssh->ssh_session = NULL;

    Curl_safefree(working_path);