diff options
author | Daniel Stenberg <daniel@haxx.se> | 2017-05-18 13:04:52 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-18 13:04:52 +0200 |
commit | 34c3dac8ddea628109410353dce4c9d29b7aa85c (patch) | |
tree | bacd260c568d9f2144cbeb5992439b73d13e17fe | |
parent | b4cfda8a4aa885b444ac2b71adbbe87906545026 (diff) | |
download | curl-34c3dac8ddea628109410353dce4c9d29b7aa85c.tar.gz |
ssh: ignore timeouts during disconnectbagder/ssh-shutdown-memoryleak
... as otherwise it risks not cleaning up the libssh2 handle properly
which leads to memory leak!
This is an alternative approch to what's done in #1479
Bug: https://curl.haxx.se/mail/lib-2017-04/0024.html
-rw-r--r-- | lib/ssh.c | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -113,6 +113,7 @@ libssh2_sftp_symlink_ex((s), (p), curlx_uztoui(strlen(p)), \ (t), (m), LIBSSH2_SFTP_REALPATH) + /* Local functions: */ static const char *sftp_libssh2_strerror(int err); static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc); @@ -2815,7 +2816,7 @@ static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done) } static CURLcode ssh_block_statemach(struct connectdata *conn, - bool duringconnect) + bool disconnect) { struct ssh_conn *sshc = &conn->proto.sshc; CURLcode result = CURLE_OK; @@ -2830,17 +2831,19 @@ static CURLcode ssh_block_statemach(struct connectdata *conn, if(result) break; - if(Curl_pgrsUpdate(conn)) - return CURLE_ABORTED_BY_CALLBACK; + if(!disconnect) { + if(Curl_pgrsUpdate(conn)) + return CURLE_ABORTED_BY_CALLBACK; - result = Curl_speedcheck(data, now); - if(result) - break; + result = Curl_speedcheck(data, now); + if(result) + break; - left = Curl_timeleft(data, NULL, duringconnect); - if(left < 0) { - failf(data, "Operation timed out"); - return CURLE_OPERATION_TIMEDOUT; + left = Curl_timeleft(data, NULL, FALSE); + if(left < 0) { + failf(data, "Operation timed out"); + return CURLE_OPERATION_TIMEDOUT; + } } #ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION @@ -3056,7 +3059,7 @@ static CURLcode scp_disconnect(struct connectdata *conn, bool dead_connection) state(conn, SSH_SESSION_DISCONNECT); - result = ssh_block_statemach(conn, FALSE); + result = ssh_block_statemach(conn, TRUE); } return result; @@ -3210,7 +3213,7 @@ static CURLcode sftp_disconnect(struct connectdata *conn, bool dead_connection) if(conn->proto.sshc.ssh_session) { /* only if there's a session still around to use! */ state(conn, SSH_SFTP_SHUTDOWN); - result = ssh_block_statemach(conn, FALSE); + result = ssh_block_statemach(conn, TRUE); } DEBUGF(infof(conn->data, "SSH DISCONNECT is done\n")); |