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

CLEANUP: Stop checking the pointer before calling pool_free()

Browse Source 
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);
This commit is contained in:
Tim Duesterhus 2023-04-22 17:47:33 +02:00 committed by Willy Tarreau
parent b1ec21d259
commit c18e244515
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dns.c
View File

@ -777,10 +777,8 @@ void dns_queries_flush(struct dns_session *ds)
void dns_session_free(struct dns_session *ds) void dns_session_free(struct dns_session *ds)
{ {
if (ds->rx_msg.area) pool_free(dns_msg_buf, ds->rx_msg.area);
pool_free(dns_msg_buf, ds->rx_msg.area); pool_free(dns_msg_buf, ds->tx_ring_area);
if (ds->tx_ring_area)
pool_free(dns_msg_buf, ds->tx_ring_area);
if (ds->task_exp) if (ds->task_exp)
task_destroy(ds->task_exp); task_destroy(ds->task_exp);
@ -1084,10 +1082,8 @@ struct dns_session *dns_session_new(struct dns_stream_server *dss)
error: error:
if (ds->task_exp) if (ds->task_exp)
task_destroy(ds->task_exp); task_destroy(ds->task_exp);
if (ds->rx_msg.area) pool_free(dns_msg_buf, ds->rx_msg.area);
pool_free(dns_msg_buf, ds->rx_msg.area); pool_free(dns_msg_buf, ds->tx_ring_area);
if (ds->tx_ring_area)
pool_free(dns_msg_buf, ds->tx_ring_area);
pool_free(dns_session_pool, ds); pool_free(dns_session_pool, ds);

3
src/event_hdl.c
View File

@ -569,8 +569,7 @@ struct event_hdl_sub *event_hdl_subscribe_ptr(event_hdl_sub_list *sub_list,
if (new_sub) { if (new_sub) {
if (hdl.async == EVENT_HDL_ASYNC_MODE_NORMAL) { if (hdl.async == EVENT_HDL_ASYNC_MODE_NORMAL) {
tasklet_free(new_sub->hdl.async_task); 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) if (hdl.async)
pool_free(pool_head_sub_event, new_sub->async_end); pool_free(pool_head_sub_event, new_sub->async_end);

3
src/quic_sock.c
View File

@ -278,8 +278,7 @@ static struct quic_dgram *quic_rxbuf_purge_dgrams(struct quic_receiver_buf *buf)
b_del(&buf->buf, cur->len); b_del(&buf->buf, cur->len);
/* Free last found unused datagram. */ /* Free last found unused datagram. */
if (prev) pool_free(pool_head_quic_dgram, prev);
pool_free(pool_head_quic_dgram, prev);
prev = cur; prev = cur;
} }

3
src/resolvers.c
View File

@ -1466,8 +1466,7 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
tmp_record->ar_item == NULL && tmp_record->ar_item == NULL &&
memcmp(tmp_record->data.target, answer_record->name, tmp_record->data_len) == 0) { memcmp(tmp_record->data.target, answer_record->name, tmp_record->data_len) == 0) {
/* Always use the received additional record to refresh info */ /* 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; tmp_record->ar_item = answer_record;
answer_record = NULL; answer_record = NULL;
break; break;