From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 13 Mar 2014 01:59:24 +0000 (+0100)
Subject: ssh: abort immediately on a header callback error
X-Git-Tag: curl-7_36_0~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c4d6ceec0fe38ec330b14a60fc346e16118c0e8;p=thirdparty%2Fcurl.git

ssh: abort immediately on a header callback error
---

diff --git a/lib/ssh.c b/lib/ssh.c
index ac4409401b..ea81a65dc5 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1196,7 +1196,13 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
            using ordinary FTP. */
         result = Curl_client_write(conn, CLIENTWRITE_HEADER, tmp, strlen(tmp));
         free(tmp);
-        state(conn, SSH_SFTP_NEXT_QUOTE);
+        if(result) {
+          state(conn, SSH_SFTP_CLOSE);
+          sshc->nextstate = SSH_NO_STATE;
+          sshc->actualcode = result;
+        }
+        else
+          state(conn, SSH_SFTP_NEXT_QUOTE);
         break;
       }
       else if(cmd) {
@@ -2171,6 +2177,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
       conn->cselect_bits = CURL_CSELECT_IN;
     }
     if(result) {
+      /* this should never occur; the close state should be entered
+         at the time the error occurs */
       state(conn, SSH_SFTP_CLOSE);
       sshc->actualcode = result;
     }