mirror of
https://github.com/curl/curl.git
synced 2025-02-05 14:30:10 +08:00
Don't shut down sftp in an error if it was never started.
This commit is contained in:
parent
72175c738f
commit
6bb9bd8b69
@ -434,6 +434,8 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done)
|
|||||||
/*
|
/*
|
||||||
* At this point we have an authenticated ssh session.
|
* At this point we have an authenticated ssh session.
|
||||||
*/
|
*/
|
||||||
|
infof(conn->data, "Authentication complete\n");
|
||||||
|
|
||||||
conn->sockfd = sock;
|
conn->sockfd = sock;
|
||||||
conn->writesockfd = CURL_SOCKET_BAD;
|
conn->writesockfd = CURL_SOCKET_BAD;
|
||||||
|
|
||||||
@ -478,8 +480,6 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done)
|
|||||||
if (conn->protocol == PROT_SCP) {
|
if (conn->protocol == PROT_SCP) {
|
||||||
real_path = (char *)malloc(working_path_len+1);
|
real_path = (char *)malloc(working_path_len+1);
|
||||||
if (real_path == NULL) {
|
if (real_path == NULL) {
|
||||||
libssh2_sftp_shutdown(ssh->sftp_session);
|
|
||||||
ssh->sftp_session = NULL;
|
|
||||||
libssh2_session_free(ssh->ssh_session);
|
libssh2_session_free(ssh->ssh_session);
|
||||||
ssh->ssh_session = NULL;
|
ssh->ssh_session = NULL;
|
||||||
Curl_safefree(working_path);
|
Curl_safefree(working_path);
|
||||||
@ -526,8 +526,6 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
libssh2_sftp_shutdown(ssh->sftp_session);
|
|
||||||
ssh->sftp_session = NULL;
|
|
||||||
libssh2_session_free(ssh->ssh_session);
|
libssh2_session_free(ssh->ssh_session);
|
||||||
ssh->ssh_session = NULL;
|
ssh->ssh_session = NULL;
|
||||||
Curl_safefree(working_path);
|
Curl_safefree(working_path);
|
||||||
|
Loading…
Reference in New Issue
Block a user