Commit 70cce4cd authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Work around an out of memory situation in Curl_ftp_done instead of 

returning an error code, to allow connections to be torn down
cleanly since this function can be called AFTER an OOM situation
has already been reached.
parent 42c0ac20

lib/ftp.c

+18 −16
Original line number Diff line number Diff line
@@ -2996,8 +2996,6 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature 
  int ftpcode;

  CURLcode result=CURLE_OK;

  bool was_ctl_valid = ftpc->ctl_valid;

  size_t flen;

  size_t dlen;

  char *path;

  char *path_to_use = data->reqdata.path;

  struct Curl_transfer_keeper *k = &data->reqdata.keep;
@@ -3043,11 +3041,14 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature 


  /* get the "raw" path */

  path = curl_easy_unescape(data, path_to_use, 0, NULL);

  if(!path)

    return CURLE_OUT_OF_MEMORY;

  if(!path) {

    /* out of memory, but we can limp along anyway (and should try to

     * since we're in the out of memory cleanup path) */

    ftpc->prevpath = NULL; /* no path */



  flen = ftp->file?strlen(ftp->file):0; /* file is "raw" already */

  dlen = strlen(path)-flen;

  } else {

    size_t flen = ftp->file?strlen(ftp->file):0; /* file is "raw" already */

    size_t dlen = strlen(path)-flen;

    if(dlen && !ftpc->cwdfail) {

      ftpc->prevpath = path;

      if(flen)
@@ -3059,6 +3060,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature 
      ftpc->prevpath = NULL; /* no path */

      free(path);

    }

  }

  /* free the dir tree and file parts */

  freedirs(conn);