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

url: make Curl_close() NULLify the pointer too

Browse source 
This is the common pattern used in the code and by a unified approach we
avoid mistakes.

Closes #4534
This commit is contained in:
Daniel Stenberg 2019-10-28 09:28:05 +01:00
parent 4011802b35
commit dcd7e37c3a
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/doh.c
View file

@ -346,7 +346,7 @@ static CURLcode dohprobe(struct Curl_easy *data,
error:
free(nurl);
Curl_close(doh);
Curl_close(&doh);
return result;
}
@ -402,10 +402,8 @@ Curl_addrinfo *Curl_doh(struct connectdata *conn,
error:
curl_slist_free_all(data->req.doh.headers);
data->req.doh.headers = NULL;
Curl_close(data->req.doh.probe[0].easy);
data->req.doh.probe[0].easy = NULL;
Curl_close(data->req.doh.probe[1].easy);
data->req.doh.probe[1].easy = NULL;
Curl_close(&data->req.doh.probe[0].easy);
Curl_close(&data->req.doh.probe[1].easy);
return NULL;
}
@ -925,11 +923,9 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn,
struct dohentry de;
/* remove DOH handles from multi handle and close them */
curl_multi_remove_handle(data->multi, data->req.doh.probe[0].easy);
Curl_close(data->req.doh.probe[0].easy);
data->req.doh.probe[0].easy = NULL;
Curl_close(&data->req.doh.probe[0].easy);
curl_multi_remove_handle(data->multi, data->req.doh.probe[1].easy);
Curl_close(data->req.doh.probe[1].easy);
data->req.doh.probe[1].easy = NULL;
Curl_close(&data->req.doh.probe[1].easy);
/* parse the responses, create the struct and return it! */
init_dohentry(&de);
rc = doh_decode(data->req.doh.probe[0].serverdoh.memory,