mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: Stop checking the pointer before calling ring_free()

Browse Source 
Changes performed with this Coccinelle patch:

    @@
    expression e;
    @@

    - if (e != NULL) {
    	ring_free(e);
    - }

    @@
    expression e;
    @@

    - if (e) {
    	ring_free(e);
    - }

    @@
    expression e;
    @@

    - if (e)
    	ring_free(e);

    @@
    expression e;
    @@

    - if (e != NULL)
    	ring_free(e);
This commit is contained in:
Tim Duesterhus 2023-04-22 17:47:35 +02:00 committed by Willy Tarreau
parent fe83f58906
commit 1307cd42d2
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dns.c
View File

@ -421,8 +421,7 @@ int dns_dgram_init(struct dns_nameserver *ns, struct sockaddr_storage *sk)
} }
return 0; return 0;
out: out:
if (dgram->ring_req) ring_free(dgram->ring_req);
ring_free(dgram->ring_req);
free(dgram); free(dgram);

6
src/resolvers.c
View File

@ -2484,13 +2484,11 @@ static void resolvers_destroy(struct resolvers *resolvers)
fd_delete(ns->dgram->conn.t.sock.fd); fd_delete(ns->dgram->conn.t.sock.fd);
close(ns->dgram->conn.t.sock.fd); close(ns->dgram->conn.t.sock.fd);
} }
if (ns->dgram->ring_req) ring_free(ns->dgram->ring_req);
ring_free(ns->dgram->ring_req);
free(ns->dgram); free(ns->dgram);
} }
if (ns->stream) { if (ns->stream) {
if (ns->stream->ring_req) ring_free(ns->stream->ring_req);
ring_free(ns->stream->ring_req);
task_destroy(ns->stream->task_req); task_destroy(ns->stream->task_req);
task_destroy(ns->stream->task_rsp); task_destroy(ns->stream->task_rsp);
free(ns->stream); free(ns->stream);

3
src/sink.c
View File

@ -1164,8 +1164,7 @@ error:
free(sft); free(sft);
if (sink) { if (sink) {
if (sink->ctx.ring) ring_free(sink->ctx.ring);
ring_free(sink->ctx.ring);
LIST_DELETE(&sink->sink_list); LIST_DELETE(&sink->sink_list);
free(sink->name); free(sink->name);