romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 22:44:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

free: instead of Curl_safefree()

Browse source 
Since we just started make use of free(NULL) in order to simplify code,
this change takes it a step further and:

- converts lots of Curl_safefree() calls to good old free()
- makes Curl_safefree() not check the pointer before free()

The (new) rule of thumb is: if you really want a function call that
frees a pointer and then assigns it to NULL, then use Curl_safefree().
But we will prefer just using free() from now on.
This commit is contained in:
Daniel Stenberg 2015-03-16 15:01:15 +01:00
parent 9e661601fe
commit 0f4a03cbb6
35 changed files with 202 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ftp.c
View file

@ -1101,7 +1101,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
if(getsockname(conn->sock[FIRSTSOCKET], sa, &sslen)) {
failf(data, "getsockname() failed: %s",
Curl_strerror(conn, SOCKERRNO) );
Curl_safefree(addr);
free(addr);
return CURLE_FTP_PORT_FAILED;
}
switch(sa->sa_family) {
@ -1133,11 +1133,11 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
if(res == NULL) {
failf(data, "failed to resolve the address provided to PORT: %s", host);
Curl_safefree(addr);
free(addr);
return CURLE_FTP_PORT_FAILED;
}
Curl_safefree(addr);
free(addr);
host = NULL;
/* step 2, create a socket for the requested address */
@ -3807,7 +3807,7 @@ static void wc_data_dtor(void *ptr)
struct ftp_wc_tmpdata *tmp = ptr;
if(tmp)
Curl_ftp_parselist_data_free(&tmp->parser);
Curl_safefree(tmp);
free(tmp);
}
static CURLcode init_wc_data(struct connectdata *conn)
@ -3861,7 +3861,7 @@ static CURLcode init_wc_data(struct connectdata *conn)
ftp_tmp->parser = Curl_ftp_parselist_data_alloc();
if(!ftp_tmp->parser) {
Curl_safefree(wildcard->pattern);
Curl_safefree(ftp_tmp);
free(ftp_tmp);
return CURLE_OUT_OF_MEMORY;
}