[GNUnet-SVN] [gnurl] 22/125: libssh2: remove dead code from SSH_SFTP_QUOTE

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 4401409468f590520dd5d0f0a55607eefa5ff4c1
Author: Daniel Stenberg <address@hidden>
AuthorDate: Mon Dec 4 09:00:34 2017 +0100

    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
---
 lib/ssh.c | 8 ++++----
 1 file 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:

-- 
To stop receiving notification emails like this one, please contact
address@hidden