From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 28 Jun 2016 13:28:04 +0000 (+0200)
Subject: SFTP: set a generic error when no SFTP one exists...
X-Git-Tag: curl-7_50_0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6ddc0ac075ecb7e86b25a26ba2faf7e7880ce13;p=thirdparty%2Fcurl.git

SFTP: set a generic error when no SFTP one exists...

... as otherwise we could get a 0 which would count as no error and we'd
wrongly continue and could end up segfaulting.

Bug: https://curl.haxx.se/mail/lib-2016-06/0052.html
Reported-by: 暖和的和暖
---

diff --git a/lib/ssh.c b/lib/ssh.c
index b98d60a682..e72b7561e0 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1161,8 +1161,13 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
       else {
         /* Return the error type */
         err = sftp_libssh2_last_error(sshc->sftp_session);
-        result = sftp_libssh2_error_to_CURLE(err);
-        sshc->actualcode = result?result:CURLE_SSH;
+        if(err)
+          result = sftp_libssh2_error_to_CURLE(err);
+        else
+          /* in this case, the error wasn't in the SFTP level but for example
+             a time-out or similar */
+          result = CURLE_SSH;
+        sshc->actualcode = result;
         DEBUGF(infof(data, "error = %d makes libcurl = %d\n",
                      err, (int)result));
         state(conn, SSH_STOP);