commit c18e244515cdf860a3be59f0fc5622b8294099e7
author Tim Duesterhus <tim@bastelstu.be> Sat Apr 22 17:47:33 2023 +0200
committer Willy Tarreau <w@1wt.eu> Sun Apr 23 00:28:25 2023 +0200
tree e78112f0b25071debf21b51be3e865f5d7c55f02
parent b1ec21d259c72559e2d170a09efc059d9fc58347

CLEANUP: Stop checking the pointer before calling `pool_free()`

Changes performed with this Coccinelle patch:

    @@
    expression e;
    expression p;
    @@

    - if (e != NULL) {
    	pool_free(p, e);
    - }

    @@
    expression e;
    expression p;
    @@

    - if (e) {
    	pool_free(p, e);
    - }

    @@
    expression e;
    expression p;
    @@

    - if (e)
    	pool_free(p, e);

    @@
    expression e;
    expression p;
    @@

    - if (e != NULL)
    	pool_free(p, e);

src/dns.c

diff --git a/src/dns.c b/src/dns.c
index a48eadd..b103c86 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -777,10 +777,8 @@
 
 void dns_session_free(struct dns_session *ds)
 {
-	if (ds->rx_msg.area)
-		pool_free(dns_msg_buf, ds->rx_msg.area);
-	if (ds->tx_ring_area)
-		pool_free(dns_msg_buf, ds->tx_ring_area);
+	pool_free(dns_msg_buf, ds->rx_msg.area);
+	pool_free(dns_msg_buf, ds->tx_ring_area);
 	if (ds->task_exp)
 		task_destroy(ds->task_exp);
 
@@ -1084,10 +1082,8 @@
 error:
 	if (ds->task_exp)
 		task_destroy(ds->task_exp);
-	if (ds->rx_msg.area)
-		pool_free(dns_msg_buf, ds->rx_msg.area);
-	if (ds->tx_ring_area)
-		pool_free(dns_msg_buf, ds->tx_ring_area);
+	pool_free(dns_msg_buf, ds->rx_msg.area);
+	pool_free(dns_msg_buf, ds->tx_ring_area);
 
 	pool_free(dns_session_pool, ds);
 

src/event_hdl.c

diff --git a/src/event_hdl.c b/src/event_hdl.c
index 5637741..e2f0124 100644
--- a/src/event_hdl.c
+++ b/src/event_hdl.c
@@ -569,8 +569,7 @@
 	if (new_sub) {
 		if (hdl.async == EVENT_HDL_ASYNC_MODE_NORMAL) {
 			tasklet_free(new_sub->hdl.async_task);
-			if (task_ctx)
-				pool_free(pool_head_sub_taskctx, task_ctx);
+			pool_free(pool_head_sub_taskctx, task_ctx);
 		}
 		if (hdl.async)
 			pool_free(pool_head_sub_event, new_sub->async_end);

src/quic_sock.c

diff --git a/src/quic_sock.c b/src/quic_sock.c
index 196ad38..d96118c 100644
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -278,8 +278,7 @@
 		b_del(&buf->buf, cur->len);
 
 		/* Free last found unused datagram. */
-		if (prev)
-			pool_free(pool_head_quic_dgram, prev);
+		pool_free(pool_head_quic_dgram, prev);
 		prev = cur;
 	}
 

src/resolvers.c

diff --git a/src/resolvers.c b/src/resolvers.c
index 6920995..a3f328d 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -1466,8 +1466,7 @@
 				    tmp_record->ar_item == NULL &&
 				    memcmp(tmp_record->data.target, answer_record->name, tmp_record->data_len) == 0) {
 					/* Always use the received additional record to refresh info */
-					if (tmp_record->ar_item)
-						pool_free(resolv_answer_item_pool, tmp_record->ar_item);
+					pool_free(resolv_answer_item_pool, tmp_record->ar_item);
 					tmp_record->ar_item = answer_record;
 					answer_record = NULL;
 					break;