Commit a9882b90 authored by Daniel Gustafsson's avatar Daniel Gustafsson
Browse files

ftp: include command in Curl_ftpsend sendbuffer 



Commit 8238ba9c inadvertently removed
the actual command to be sent from the send buffer in a refactoring.
Add back copying the command into the buffer. Also add more guards
against malformed input while at it.

Closes #2985
Reviewed-by: default avatarDaniel Stenberg <daniel@haxx.se>
parent 60ed8d72

lib/ftp.c

+5 −1
Original line number Diff line number Diff line
@@ -3963,10 +3963,14 @@ CURLcode Curl_ftpsend(struct connectdata *conn, const char *cmd) 
  enum protection_level data_sec = conn->data_prot;

#endif



  if(!cmd)

    return CURLE_BAD_FUNCTION_ARGUMENT;



  write_len = strlen(cmd);

  if(write_len > (sizeof(s) -3))

  if(!write_len || write_len > (sizeof(s) -3))

    return CURLE_BAD_FUNCTION_ARGUMENT;



  memcpy(&s, cmd, write_len);

  strcpy(&s[write_len], "\r\n"); /* append a trailing CRLF */

  write_len += 2;

  bytes_written = 0;