summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-12-04 09:00:34 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-12-04 13:23:12 +0100
commit4401409468f590520dd5d0f0a55607eefa5ff4c1 (patch)
tree5c61a954262c07a407cb3e61b209aed320e02408
parent6401ddad4461c435b2cad371091ef5421b9ae7f2 (diff)
downloadcurl-4401409468f590520dd5d0f0a55607eefa5ff4c1.tar.gz
libssh2: remove dead code from SSH_SFTP_QUOTE
Figured out while reviewing code in the libssh backend. The pointer was checked for NULL after having been dereferenced, so we know it would always equal true or it would've crashed. Pointed-out-by: Nikos Mavrogiannopoulos Bug #2143 Closes #2148
-rw-r--r--lib/ssh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index ef169ade7..a4dd878bf 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1142,6 +1142,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
/*
* Support some of the "FTP" commands
+ *
+ * 'sshc->quote_item' is already verified to be non-NULL before it
+ * switched to this state.
*/
char *cmd = sshc->quote_item->data;
sshc->acceptfail = FALSE;
@@ -1184,7 +1187,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
state(conn, SSH_SFTP_NEXT_QUOTE);
break;
}
- if(cmd) {
+ {
/*
* the arguments following the command must be separated from the
* command with a space so we can check for it unconditionally
@@ -1314,9 +1317,6 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break;
}
}
- if(!sshc->quote_item) {
- state(conn, SSH_SFTP_GETINFO);
- }
break;
case SSH_SFTP_NEXT_QUOTE: