From 8c4d6ceec0fe38ec330b14a60fc346e16118c0e8 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 13 Mar 2014 02:59:24 +0100 Subject: [PATCH] ssh: abort immediately on a header callback error --- lib/ssh.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/ssh.c b/lib/ssh.c index ac4409401..ea81a65dc 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; }