generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssh: abort immediately on a header callback error

Browse Source
This commit is contained in:
Dan Fandrich 2014-03-13 02:59:24 +01:00
parent 891ef341b3
commit 8c4d6ceec0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ssh.c
View File

@ -1196,7 +1196,13 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
using ordinary FTP. */ using ordinary FTP. */
result = Curl_client_write(conn, CLIENTWRITE_HEADER, tmp, strlen(tmp)); result = Curl_client_write(conn, CLIENTWRITE_HEADER, tmp, strlen(tmp));
free(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; break;
} }
else if(cmd) { else if(cmd) {
@ -2171,6 +2177,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
conn->cselect_bits = CURL_CSELECT_IN; conn->cselect_bits = CURL_CSELECT_IN;
} }
if(result) { if(result) {
/* this should never occur; the close state should be entered
at the time the error occurs */
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = result; sshc->actualcode = result;
} }