mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 15:48:49 -05:00
libssh: remove dead code in sftp_qoute
... by removing a superfluous NULL pointer check that also confuses Coverity. Fixes #2143 Closes #2153
This commit is contained in:
Daniel Stenberg
parent
615edc1f73
commit
85f0133ea1
242
lib/ssh-libssh.c
242
lib/ssh-libssh.c
@ -2516,138 +2516,132 @@ static void sftp_quote(struct connectdata *conn)
|
|||||||
state(conn, SSH_SFTP_NEXT_QUOTE);
|
state(conn, SSH_SFTP_NEXT_QUOTE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(cmd) {
|
|
||||||
/*
|
|
||||||
* the arguments following the command must be separated from the
|
|
||||||
* command with a space so we can check for it unconditionally
|
|
||||||
*/
|
|
||||||
cp = strchr(cmd, ' ');
|
|
||||||
if(cp == NULL) {
|
|
||||||
failf(data, "Syntax error in SFTP command. Supply parameter(s)!");
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
|
||||||
sshc->actualcode = CURLE_QUOTE_ERROR;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* also, every command takes at least one argument so we get that
|
* the arguments following the command must be separated from the
|
||||||
* first argument right now
|
* command with a space so we can check for it unconditionally
|
||||||
*/
|
*/
|
||||||
result = Curl_get_pathname(&cp, &sshc->quote_path1);
|
cp = strchr(cmd, ' ');
|
||||||
if(result) {
|
if(cp == NULL) {
|
||||||
if(result == CURLE_OUT_OF_MEMORY)
|
failf(data, "Syntax error in SFTP command. Supply parameter(s)!");
|
||||||
failf(data, "Out of memory");
|
|
||||||
else
|
|
||||||
failf(data, "Syntax error: Bad first parameter");
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
|
||||||
sshc->actualcode = result;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* SFTP is a binary protocol, so we don't send text commands
|
|
||||||
* to the server. Instead, we scan for commands used by
|
|
||||||
* OpenSSH's sftp program and call the appropriate libssh
|
|
||||||
* functions.
|
|
||||||
*/
|
|
||||||
if(strncasecompare(cmd, "chgrp ", 6) ||
|
|
||||||
strncasecompare(cmd, "chmod ", 6) ||
|
|
||||||
strncasecompare(cmd, "chown ", 6)) {
|
|
||||||
/* attribute change */
|
|
||||||
|
|
||||||
/* sshc->quote_path1 contains the mode to set */
|
|
||||||
/* get the destination */
|
|
||||||
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
|
||||||
if(result) {
|
|
||||||
if(result == CURLE_OUT_OF_MEMORY)
|
|
||||||
failf(data, "Out of memory");
|
|
||||||
else
|
|
||||||
failf(data, "Syntax error in chgrp/chmod/chown: "
|
|
||||||
"Bad second parameter");
|
|
||||||
Curl_safefree(sshc->quote_path1);
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
|
||||||
sshc->actualcode = result;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
sshc->quote_attrs = NULL;
|
|
||||||
state(conn, SSH_SFTP_QUOTE_STAT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(strncasecompare(cmd, "ln ", 3) ||
|
|
||||||
strncasecompare(cmd, "symlink ", 8)) {
|
|
||||||
/* symbolic linking */
|
|
||||||
/* sshc->quote_path1 is the source */
|
|
||||||
/* get the destination */
|
|
||||||
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
|
||||||
if(result) {
|
|
||||||
if(result == CURLE_OUT_OF_MEMORY)
|
|
||||||
failf(data, "Out of memory");
|
|
||||||
else
|
|
||||||
failf(data, "Syntax error in ln/symlink: Bad second parameter");
|
|
||||||
Curl_safefree(sshc->quote_path1);
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
|
||||||
sshc->actualcode = result;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
state(conn, SSH_SFTP_QUOTE_SYMLINK);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if(strncasecompare(cmd, "mkdir ", 6)) {
|
|
||||||
/* create dir */
|
|
||||||
state(conn, SSH_SFTP_QUOTE_MKDIR);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if(strncasecompare(cmd, "rename ", 7)) {
|
|
||||||
/* rename file */
|
|
||||||
/* first param is the source path */
|
|
||||||
/* second param is the dest. path */
|
|
||||||
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
|
||||||
if(result) {
|
|
||||||
if(result == CURLE_OUT_OF_MEMORY)
|
|
||||||
failf(data, "Out of memory");
|
|
||||||
else
|
|
||||||
failf(data, "Syntax error in rename: Bad second parameter");
|
|
||||||
Curl_safefree(sshc->quote_path1);
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
|
||||||
sshc->actualcode = result;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
state(conn, SSH_SFTP_QUOTE_RENAME);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if(strncasecompare(cmd, "rmdir ", 6)) {
|
|
||||||
/* delete dir */
|
|
||||||
state(conn, SSH_SFTP_QUOTE_RMDIR);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if(strncasecompare(cmd, "rm ", 3)) {
|
|
||||||
state(conn, SSH_SFTP_QUOTE_UNLINK);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#ifdef HAS_STATVFS_SUPPORT
|
|
||||||
else if(strncasecompare(cmd, "statvfs ", 8)) {
|
|
||||||
state(conn, SSH_SFTP_QUOTE_STATVFS);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
failf(data, "Unknown SFTP command");
|
|
||||||
Curl_safefree(sshc->quote_path1);
|
|
||||||
Curl_safefree(sshc->quote_path2);
|
|
||||||
state(conn, SSH_SFTP_CLOSE);
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
sshc->nextstate = SSH_NO_STATE;
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
sshc->actualcode = CURLE_QUOTE_ERROR;
|
sshc->actualcode = CURLE_QUOTE_ERROR;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!sshc->quote_item) {
|
/*
|
||||||
state(conn, SSH_SFTP_GETINFO);
|
* also, every command takes at least one argument so we get that
|
||||||
|
* first argument right now
|
||||||
|
*/
|
||||||
|
result = Curl_get_pathname(&cp, &sshc->quote_path1);
|
||||||
|
if(result) {
|
||||||
|
if(result == CURLE_OUT_OF_MEMORY)
|
||||||
|
failf(data, "Out of memory");
|
||||||
|
else
|
||||||
|
failf(data, "Syntax error: Bad first parameter");
|
||||||
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
|
sshc->actualcode = result;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SFTP is a binary protocol, so we don't send text commands
|
||||||
|
* to the server. Instead, we scan for commands used by
|
||||||
|
* OpenSSH's sftp program and call the appropriate libssh
|
||||||
|
* functions.
|
||||||
|
*/
|
||||||
|
if(strncasecompare(cmd, "chgrp ", 6) ||
|
||||||
|
strncasecompare(cmd, "chmod ", 6) ||
|
||||||
|
strncasecompare(cmd, "chown ", 6)) {
|
||||||
|
/* attribute change */
|
||||||
|
|
||||||
|
/* sshc->quote_path1 contains the mode to set */
|
||||||
|
/* get the destination */
|
||||||
|
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
||||||
|
if(result) {
|
||||||
|
if(result == CURLE_OUT_OF_MEMORY)
|
||||||
|
failf(data, "Out of memory");
|
||||||
|
else
|
||||||
|
failf(data, "Syntax error in chgrp/chmod/chown: "
|
||||||
|
"Bad second parameter");
|
||||||
|
Curl_safefree(sshc->quote_path1);
|
||||||
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
|
sshc->actualcode = result;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sshc->quote_attrs = NULL;
|
||||||
|
state(conn, SSH_SFTP_QUOTE_STAT);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(strncasecompare(cmd, "ln ", 3) ||
|
||||||
|
strncasecompare(cmd, "symlink ", 8)) {
|
||||||
|
/* symbolic linking */
|
||||||
|
/* sshc->quote_path1 is the source */
|
||||||
|
/* get the destination */
|
||||||
|
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
||||||
|
if(result) {
|
||||||
|
if(result == CURLE_OUT_OF_MEMORY)
|
||||||
|
failf(data, "Out of memory");
|
||||||
|
else
|
||||||
|
failf(data, "Syntax error in ln/symlink: Bad second parameter");
|
||||||
|
Curl_safefree(sshc->quote_path1);
|
||||||
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
|
sshc->actualcode = result;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
state(conn, SSH_SFTP_QUOTE_SYMLINK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(strncasecompare(cmd, "mkdir ", 6)) {
|
||||||
|
/* create dir */
|
||||||
|
state(conn, SSH_SFTP_QUOTE_MKDIR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(strncasecompare(cmd, "rename ", 7)) {
|
||||||
|
/* rename file */
|
||||||
|
/* first param is the source path */
|
||||||
|
/* second param is the dest. path */
|
||||||
|
result = Curl_get_pathname(&cp, &sshc->quote_path2);
|
||||||
|
if(result) {
|
||||||
|
if(result == CURLE_OUT_OF_MEMORY)
|
||||||
|
failf(data, "Out of memory");
|
||||||
|
else
|
||||||
|
failf(data, "Syntax error in rename: Bad second parameter");
|
||||||
|
Curl_safefree(sshc->quote_path1);
|
||||||
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
|
sshc->actualcode = result;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
state(conn, SSH_SFTP_QUOTE_RENAME);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(strncasecompare(cmd, "rmdir ", 6)) {
|
||||||
|
/* delete dir */
|
||||||
|
state(conn, SSH_SFTP_QUOTE_RMDIR);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(strncasecompare(cmd, "rm ", 3)) {
|
||||||
|
state(conn, SSH_SFTP_QUOTE_UNLINK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#ifdef HAS_STATVFS_SUPPORT
|
||||||
|
else if(strncasecompare(cmd, "statvfs ", 8)) {
|
||||||
|
state(conn, SSH_SFTP_QUOTE_STATVFS);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
failf(data, "Unknown SFTP command");
|
||||||
|
Curl_safefree(sshc->quote_path1);
|
||||||
|
Curl_safefree(sshc->quote_path2);
|
||||||
|
state(conn, SSH_SFTP_CLOSE);
|
||||||
|
sshc->nextstate = SSH_NO_STATE;
|
||||||
|
sshc->actualcode = CURLE_QUOTE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sftp_quote_stat(struct connectdata *conn)
|
static void sftp_quote_stat(struct connectdata *conn)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user