libknot/rrset: don't sanitize input pointer in knot_rrset_free

diff --git a/src/knot/ctl/commands.c b/src/knot/ctl/commands.c
index e00e25e52d8513f242f8d18884a12f914342971e..a5e157f7c53500f12d51f843344c88d3c0474106 100644 (file)
--- a/src/knot/ctl/commands.c
+++ b/src/knot/ctl/commands.c
@@ -929,7 +929,7 @@ static int zone_txn_set(zone_t *zone, ctl_args_t *args)
        }
 
        ret = zone_update_add(zone->control_update, rrset);
-       knot_rrset_free(&rrset, NULL);
+       knot_rrset_free(rrset, NULL);
 
        return ret;
 }
@@ -957,7 +957,7 @@ static int zone_txn_unset(zone_t *zone, ctl_args_t *args)
                }
 
                ret = zone_update_remove(zone->control_update, rrset);
-               knot_rrset_free(&rrset, NULL);
+               knot_rrset_free(rrset, NULL);
                return ret;
        } else {
                uint8_t owner[KNOT_DNAME_MAXLEN];

diff --git a/src/knot/dnssec/nsec-chain.c b/src/knot/dnssec/nsec-chain.c
index eb9fed0abef76919bb6809df23b6894a1f60d2eb..1f81e866fa1a3a7b1acc16b18bd85c345b1c6e7c 100644 (file)
--- a/src/knot/dnssec/nsec-chain.c
+++ b/src/knot/dnssec/nsec-chain.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -117,13 +117,13 @@ static int connect_nsec_nodes(zone_node_t *a, zone_node_t *b,
                knot_rrset_t *old_nsec_lc = knot_rrset_copy(&old_nsec, NULL);
                ret = knot_rrset_rr_to_canonical(old_nsec_lc);
                if (ret != KNOT_EOK) {
-                       knot_rrset_free(&old_nsec_lc, NULL);
+                       knot_rrset_free(old_nsec_lc, NULL);
                        return ret;
                }
 
                bool equal = knot_rrset_equal(&new_nsec, old_nsec_lc,
                                              KNOT_RRSET_COMPARE_WHOLE);
-               knot_rrset_free(&old_nsec_lc, NULL);
+               knot_rrset_free(old_nsec_lc, NULL);
 
                if (equal) {
                        // current NSEC is valid, do nothing

diff --git a/src/knot/dnssec/nsec3-chain.c b/src/knot/dnssec/nsec3-chain.c
index 9fa1b0c059aebb4862c86a3e9d038461f4ad26b5..06a574b6bd1eeb952c7628ad6a0d2e103abe13b7 100644 (file)
--- a/src/knot/dnssec/nsec3-chain.c
+++ b/src/knot/dnssec/nsec3-chain.c
@@ -458,7 +458,7 @@ static int connect_nsec3_nodes2(zone_node_t *a, zone_node_t *b,
        // connect the copied rrset
        int ret = connect_nsec3_base(&acopy->rrs, b->owner);
        if (ret != KNOT_EOK || knot_rrset_equal(&aorig, acopy, KNOT_RRSET_COMPARE_WHOLE)) {
-               knot_rrset_free(&acopy, NULL);
+               knot_rrset_free(acopy, NULL);
                return ret;
        }
 
@@ -471,7 +471,7 @@ static int connect_nsec3_nodes2(zone_node_t *a, zone_node_t *b,
        if (ret == KNOT_EOK) {
                ret = changeset_add_addition(data->changeset, acopy, CHANGESET_CHECK | CHANGESET_CHECK_CANCELOUT);
        }
-       knot_rrset_free(&acopy, NULL);
+       knot_rrset_free(acopy, NULL);
        return ret;
 }
 

diff --git a/src/knot/dnssec/zone-nsec.c b/src/knot/dnssec/zone-nsec.c
index 5837d03d59ea395a7dc827890424792cd4df2bbf..6c595ea7f69a3bb35eaa1ec0b3a1557d02f6fb12 100644 (file)
--- a/src/knot/dnssec/zone-nsec.c
+++ b/src/knot/dnssec/zone-nsec.c
@@ -272,12 +272,12 @@ static int add_nsec3param(const zone_contents_t *zone, changeset_t *changeset,
 
        int r = set_nsec3param(rrset, params);
        if (r != KNOT_EOK) {
-               knot_rrset_free(&rrset, NULL);
+               knot_rrset_free(rrset, NULL);
                return r;
        }
 
        r = changeset_add_addition(changeset, rrset, 0);
-       knot_rrset_free(&rrset, NULL);
+       knot_rrset_free(rrset, NULL);
        return r;
 }
 

diff --git a/src/knot/dnssec/zone-sign.c b/src/knot/dnssec/zone-sign.c
index 80a860160a16ae17a88a0bb911ef2c0b965950f9..068910bf7f219e75e248b0627e6986878fa6437a 100644 (file)
--- a/src/knot/dnssec/zone-sign.c
+++ b/src/knot/dnssec/zone-sign.c
@@ -1002,9 +1002,9 @@ int knot_zone_sign_update_dnskeys(zone_update_t *update,
 #undef CHECK_RET
 
 cleanup:
-       knot_rrset_free(&add_dnskeys, NULL);
-       knot_rrset_free(&add_cdnskeys, NULL);
-       knot_rrset_free(&add_cdss, NULL);
+       knot_rrset_free(add_dnskeys, NULL);
+       knot_rrset_free(add_cdnskeys, NULL);
+       knot_rrset_free(add_cdss, NULL);
        changeset_clear(&ch);
        return ret;
 }

diff --git a/src/knot/events/handlers/refresh.c b/src/knot/events/handlers/refresh.c
index 1d5af5622b6a8f9cbfd8ea5b29b5c16d3f86f205..a29e6556181010a8df9f908147975e7c6f158079 100644 (file)
--- a/src/knot/events/handlers/refresh.c
+++ b/src/knot/events/handlers/refresh.c
@@ -355,7 +355,7 @@ static int axfr_consume(knot_pkt_t *pkt, struct refresh_data *data)
        // Process saved SOA if fallback from IXFR
        if (data->initial_soa_copy != NULL) {
                next = axfr_consume_rr(data->initial_soa_copy, data);
-               knot_rrset_free(&data->initial_soa_copy, data->mm);
+               knot_rrset_free(data->initial_soa_copy, data->mm);
                if (next != KNOT_STATE_CONSUME) {
                        return next;
                }
@@ -400,7 +400,7 @@ static void ixfr_cleanup(struct refresh_data *data)
                return;
        }
 
-       knot_rrset_free(&data->ixfr.final_soa, data->mm);
+       knot_rrset_free(data->ixfr.final_soa, data->mm);
        mm_free(data->mm, data->ixfr.proc);
        data->ixfr.proc = NULL;
 
@@ -779,7 +779,7 @@ static int ixfr_consume(knot_pkt_t *pkt, struct refresh_data *data)
        // Process saved SOA if existing
        if (data->initial_soa_copy != NULL) {
                next = ixfr_consume_rr(data->initial_soa_copy, data);
-               knot_rrset_free(&data->initial_soa_copy, data->mm);
+               knot_rrset_free(data->initial_soa_copy, data->mm);
                if (next != KNOT_STATE_CONSUME) {
                        return next;
                }
@@ -870,13 +870,13 @@ static int transfer_produce(knot_layer_t *layer, knot_pkt_t *pkt)
                uint32_t master_serial;
                int ret = zone_get_master_serial(data->zone, &master_serial);
                if (sending_soa == NULL || ret != KNOT_EOK) {
-                       knot_rrset_free(&sending_soa, data->mm);
+                       knot_rrset_free(sending_soa, data->mm);
                        return KNOT_STATE_FAIL;
                }
                knot_soa_serial_set(&sending_soa->rrs, master_serial);
                knot_pkt_begin(pkt, KNOT_AUTHORITY);
                knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, sending_soa, 0);
-               knot_rrset_free(&sending_soa, data->mm);
+               knot_rrset_free(sending_soa, data->mm);
        }
 
        query_put_edns(pkt, &data->edns);

diff --git a/src/knot/modules/onlinesign/onlinesign.c b/src/knot/modules/onlinesign/onlinesign.c
index 654cc4e435ea08d1585024fe6974e52963041f54..afcff02beeecc702043c8552470fe0712c1bdaf5 100644 (file)
--- a/src/knot/modules/onlinesign/onlinesign.c
+++ b/src/knot/modules/onlinesign/onlinesign.c
@@ -199,14 +199,14 @@ static knot_rrset_t *synth_nsec(knot_pkt_t *pkt, knotd_qdata_t *qdata, knot_mm_t
 
        knot_dname_t *next = online_nsec_next(nsec_owner, knotd_qdata_zone_name(qdata));
        if (!next) {
-               knot_rrset_free(&nsec, mm);
+               knot_rrset_free(nsec, mm);
                return NULL;
        }
 
        dnssec_nsec_bitmap_t *bitmap = synth_bitmap(pkt, qdata, !is_deleg(pkt));
        if (!bitmap) {
                free(next);
-               knot_rrset_free(&nsec, mm);
+               knot_rrset_free(nsec, mm);
                return NULL;
        }
 
@@ -220,7 +220,7 @@ static knot_rrset_t *synth_nsec(knot_pkt_t *pkt, knotd_qdata_t *qdata, knot_mm_t
        dnssec_nsec_bitmap_free(bitmap);
 
        if (knot_rrset_add_rdata(nsec, rdata, size, mm) != KNOT_EOK) {
-               knot_rrset_free(&nsec, mm);
+               knot_rrset_free(nsec, mm);
                return NULL;
        }
 
@@ -259,7 +259,7 @@ static knot_rrset_t *sign_rrset(const knot_dname_t *owner,
        }
 
        if (knot_rdataset_copy(&copy->rrs, &cover->rrs, NULL) != KNOT_EOK) {
-               knot_rrset_free(&copy, NULL);
+               knot_rrset_free(copy, NULL);
                return NULL;
        }
 
@@ -268,7 +268,7 @@ static knot_rrset_t *sign_rrset(const knot_dname_t *owner,
        knot_rrset_t *rrsig = knot_rrset_new(owner, KNOT_RRTYPE_RRSIG, copy->rclass,
                                             copy->ttl, mm);
        if (!rrsig) {
-               knot_rrset_free(&copy, NULL);
+               knot_rrset_free(copy, NULL);
                return NULL;
        }
 
@@ -281,13 +281,13 @@ static knot_rrset_t *sign_rrset(const knot_dname_t *owner,
 
                int ret = knot_sign_rrset(rrsig, copy, kkey->key, kkey->ctx, &module_ctx->kctx, mm);
                if (ret != KNOT_EOK) {
-                       knot_rrset_free(&copy, NULL);
-                       knot_rrset_free(&rrsig, mm);
+                       knot_rrset_free(copy, NULL);
+                       knot_rrset_free(rrsig, mm);
                        return NULL;
                }
        }
 
-       knot_rrset_free(&copy, NULL);
+       knot_rrset_free(copy, NULL);
 
        return rrsig;
 }
@@ -354,7 +354,7 @@ static knotd_in_state_t sign_section(knotd_in_state_t state, knot_pkt_t *pkt,
 
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_NONE, rrsig, KNOT_PF_FREE);
                if (r != KNOT_EOK) {
-                       knot_rrset_free(&rrsig, &pkt->mm);
+                       knot_rrset_free(rrsig, &pkt->mm);
                        state = KNOTD_IN_STATE_ERROR;
                        break;
                }
@@ -376,7 +376,7 @@ static knotd_in_state_t synth_authority(knotd_in_state_t state, knot_pkt_t *pkt,
                knot_rrset_t *nsec = synth_nsec(pkt, qdata, &pkt->mm);
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_NONE, nsec, KNOT_PF_FREE);
                if (r != DNSSEC_EOK) {
-                       knot_rrset_free(&nsec, &pkt->mm);
+                       knot_rrset_free(nsec, &pkt->mm);
                        return KNOTD_IN_STATE_ERROR;
                }
        }
@@ -413,7 +413,7 @@ static knot_rrset_t *synth_dnskey(knotd_qdata_t *qdata, const zone_keyset_t *key
 
                int r = knot_rrset_add_rdata(dnskey, rdata.data, rdata.size, mm);
                if (r != KNOT_EOK) {
-                       knot_rrset_free(&dnskey, mm);
+                       knot_rrset_free(dnskey, mm);
                        return NULL;
                }
        }
@@ -451,7 +451,7 @@ static knot_rrset_t *synth_cdnskey(knotd_qdata_t *qdata, online_sign_ctx_t *ctx,
        dnssec_binary_t rdata = { 0 };
        zone_key_t *key = ksk_for_cds(ctx);
        if (key == NULL) {
-               knot_rrset_free(&dnskey, mm);
+               knot_rrset_free(dnskey, mm);
                return NULL;
        }
        dnssec_key_get_rdata(key->key, &rdata);
@@ -459,7 +459,7 @@ static knot_rrset_t *synth_cdnskey(knotd_qdata_t *qdata, online_sign_ctx_t *ctx,
 
        int ret = knot_rrset_add_rdata(dnskey, rdata.data, rdata.size, mm);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&dnskey, mm);
+               knot_rrset_free(dnskey, mm);
                return NULL;
        }
 
@@ -479,7 +479,7 @@ static knot_rrset_t *synth_cds(knotd_qdata_t *qdata, online_sign_ctx_t *ctx,
        dnssec_binary_t rdata = { 0 };
        zone_key_t *key = ksk_for_cds(ctx);
        if (key == NULL) {
-               knot_rrset_free(&ds, mm);
+               knot_rrset_free(ds, mm);
                return NULL;
        }
        zone_key_calculate_ds(key, &rdata);
@@ -487,7 +487,7 @@ static knot_rrset_t *synth_cds(knotd_qdata_t *qdata, online_sign_ctx_t *ctx,
 
        int ret = knot_rrset_add_rdata(ds, rdata.data, rdata.size, mm);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&ds, mm);
+               knot_rrset_free(ds, mm);
                return NULL;
        }
 
@@ -573,7 +573,7 @@ static knotd_in_state_t synth_answer(knotd_in_state_t state, knot_pkt_t *pkt,
 
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, dnskey, KNOT_PF_FREE);
                if (r != DNSSEC_EOK) {
-                       knot_rrset_free(&dnskey, &pkt->mm);
+                       knot_rrset_free(dnskey, &pkt->mm);
                        return KNOTD_IN_STATE_ERROR;
                }
                state = KNOTD_IN_STATE_HIT;
@@ -587,7 +587,7 @@ static knotd_in_state_t synth_answer(knotd_in_state_t state, knot_pkt_t *pkt,
 
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, dnskey, KNOT_PF_FREE);
                if (r != DNSSEC_EOK) {
-                       knot_rrset_free(&dnskey, &pkt->mm);
+                       knot_rrset_free(dnskey, &pkt->mm);
                        return KNOTD_IN_STATE_ERROR;
                }
                state = KNOTD_IN_STATE_HIT;
@@ -601,7 +601,7 @@ static knotd_in_state_t synth_answer(knotd_in_state_t state, knot_pkt_t *pkt,
 
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, ds, KNOT_PF_FREE);
                if (r != DNSSEC_EOK) {
-                       knot_rrset_free(&ds, &pkt->mm);
+                       knot_rrset_free(ds, &pkt->mm);
                        return KNOTD_IN_STATE_ERROR;
                }
                state = KNOTD_IN_STATE_HIT;
@@ -615,7 +615,7 @@ static knotd_in_state_t synth_answer(knotd_in_state_t state, knot_pkt_t *pkt,
 
                int r = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, nsec, KNOT_PF_FREE);
                if (r != DNSSEC_EOK) {
-                       knot_rrset_free(&nsec, &pkt->mm);
+                       knot_rrset_free(nsec, &pkt->mm);
                        return KNOTD_IN_STATE_ERROR;
                }
 

diff --git a/src/knot/modules/synthrecord/synthrecord.c b/src/knot/modules/synthrecord/synthrecord.c
index 27d437395b69ed77d52d6e5502801b3e18357d61..b54e783dc327639a26e9e894d20041785b47d7c3 100644 (file)
--- a/src/knot/modules/synthrecord/synthrecord.c
+++ b/src/knot/modules/synthrecord/synthrecord.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -333,7 +333,7 @@ static knot_rrset_t *synth_rr(char *addr_str, const synth_template_t *tpl, knot_
        }
 
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&rr, &pkt->mm);
+               knot_rrset_free(rr, &pkt->mm);
                return NULL;
        }
 

diff --git a/src/knot/modules/whoami/whoami.c b/src/knot/modules/whoami/whoami.c
index d6eaaeaffa7aa13176ab514ca77e791eba383f00..1a43e12e62d47a05b9af3c6fc1d6cb6c3d6468cd 100644 (file)
--- a/src/knot/modules/whoami/whoami.c
+++ b/src/knot/modules/whoami/whoami.c
@@ -94,14 +94,14 @@ static knotd_in_state_t whoami_query(knotd_in_state_t state, knot_pkt_t *pkt,
        /* Record data is the query source address. */
        int ret = knot_rrset_add_rdata(rrset, rdata, len_rdata, &pkt->mm);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&rrset, &pkt->mm);
+               knot_rrset_free(rrset, &pkt->mm);
                return KNOTD_IN_STATE_ERROR;
        }
 
        /* Add the new RRset to the response packet. */
        ret = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, rrset, KNOT_PF_FREE);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&rrset, &pkt->mm);
+               knot_rrset_free(rrset, &pkt->mm);
                return KNOTD_IN_STATE_ERROR;
        }
 

diff --git a/src/knot/updates/changesets.c b/src/knot/updates/changesets.c
index 138083e4cb3cbae8aa11bea5d3e60c5fe4622fe4..0e4f9334c8d7d7a8dcc751e79e5e95b246ee4e63 100644 (file)
--- a/src/knot/updates/changesets.c
+++ b/src/knot/updates/changesets.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ static int handle_soa(knot_rrset_t **soa, const knot_rrset_t *rrset)
        assert(rrset);
 
        if (*soa != NULL) {
-               knot_rrset_free(soa, NULL);
+               knot_rrset_free(*soa, NULL);
        }
 
        *soa = knot_rrset_copy(rrset, NULL);
@@ -304,9 +304,9 @@ int changeset_add_addition(changeset_t *ch, const knot_rrset_t *rrset, changeset
        int ret = knot_rrset_empty(to_add) ? KNOT_EOK : add_rr_to_contents(ch->add, to_add);
 
        if (flags & CHANGESET_CHECK) {
-               knot_rrset_free((knot_rrset_t **)&rrset, NULL);
+               knot_rrset_free((knot_rrset_t *)rrset, NULL);
        }
-       knot_rrset_free(&rrset_cancelout, NULL);
+       knot_rrset_free(rrset_cancelout, NULL);
 
        return ret;
 }
@@ -341,9 +341,9 @@ int changeset_add_removal(changeset_t *ch, const knot_rrset_t *rrset, changeset_
        int ret = knot_rrset_empty(to_remove) ? KNOT_EOK : add_rr_to_contents(ch->remove, to_remove);
 
        if (flags & CHANGESET_CHECK) {
-               knot_rrset_free((knot_rrset_t **)&rrset, NULL);
+               knot_rrset_free((knot_rrset_t *)rrset, NULL);
        }
-       knot_rrset_free(&rrset_cancelout, NULL);
+       knot_rrset_free(rrset_cancelout, NULL);
 
        return ret;
 }
@@ -353,7 +353,7 @@ int changeset_remove_addition(changeset_t *ch, const knot_rrset_t *rrset)
        if (rrset->type == KNOT_RRTYPE_SOA) {
                /* Do not add SOAs into actual contents. */
                if (ch->soa_to != NULL) {
-                       knot_rrset_free(&ch->soa_to, NULL);
+                       knot_rrset_free(ch->soa_to, NULL);
                        ch->soa_to = NULL;
                }
                return KNOT_EOK;
@@ -368,7 +368,7 @@ int changeset_remove_removal(changeset_t *ch, const knot_rrset_t *rrset)
        if (rrset->type == KNOT_RRTYPE_SOA) {
                /* Do not add SOAs into actual contents. */
                if (ch->soa_from != NULL) {
-                       knot_rrset_free(&ch->soa_from, NULL);
+                       knot_rrset_free(ch->soa_from, NULL);
                        ch->soa_from = NULL;
                }
                return KNOT_EOK;
@@ -417,7 +417,7 @@ int changeset_merge(changeset_t *ch1, const changeset_t *ch2, int flags)
        if (soa_copy == NULL && ch2->soa_to) {
                return KNOT_ENOMEM;
        }
-       knot_rrset_free(&ch1->soa_to, NULL);
+       knot_rrset_free(ch1->soa_to, NULL);
        ch1->soa_to = soa_copy;
 
        return KNOT_EOK;
@@ -466,7 +466,7 @@ static int preapply_fix_rrset(const knot_rrset_t *apply, bool adding, void *data
                }
        }
 
-       knot_rrset_free(&fixrrset, ctx->mm);
+       knot_rrset_free(fixrrset, ctx->mm);
        return ret;
 }
 
@@ -539,7 +539,7 @@ int changeset_to_contents(changeset_t *ch, zone_contents_t **out)
 
        *out = ch->add;
        int ret = add_rr_to_contents(*out, ch->soa_to);
-       knot_rrset_free(&ch->soa_to, NULL);
+       knot_rrset_free(ch->soa_to, NULL);
        if (ret != KNOT_EOK) {
                zone_contents_deep_free(out);
        }
@@ -578,8 +578,8 @@ void changeset_from_contents_free(changeset_t *ch)
        update_free_zone(&ch->add);
 
        zone_contents_deep_free(&ch->remove);
-       knot_rrset_free(&ch->soa_from, NULL);
-       knot_rrset_free(&ch->soa_to, NULL);
+       knot_rrset_free(ch->soa_from, NULL);
+       knot_rrset_free(ch->soa_to, NULL);
        free(ch->data);
        free(ch);
 }
@@ -618,8 +618,10 @@ void changeset_clear(changeset_t *ch)
        zone_contents_deep_free(&ch->add);
        zone_contents_deep_free(&ch->remove);
 
-       knot_rrset_free(&ch->soa_from, NULL);
-       knot_rrset_free(&ch->soa_to, NULL);
+       knot_rrset_free(ch->soa_from, NULL);
+       knot_rrset_free(ch->soa_to, NULL);
+       ch->soa_from = NULL;
+       ch->soa_to = NULL;
 
        // Delete binary data
        free(ch->data);

diff --git a/src/knot/updates/ddns.c b/src/knot/updates/ddns.c
index 763e2ef6b80e6bb04d6dbcfac8590004fc781b37..f0a3d893c3e0a89dad2359f919edbdc9fd23098e 100644 (file)
--- a/src/knot/updates/ddns.c
+++ b/src/knot/updates/ddns.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ static void rrset_list_clear(list_t *l)
        WALK_LIST_DELSAFE(n, nxt, *l) {
                ptrnode_t *ptr_n = (ptrnode_t *)n;
                knot_rrset_t *rrset = (knot_rrset_t *)ptr_n->d;
-               knot_rrset_free(&rrset, NULL);
+               knot_rrset_free(rrset, NULL);
                free(n);
        };
 }

diff --git a/src/knot/updates/zone-update.c b/src/knot/updates/zone-update.c
index 958a0f9f1d5ee811d151479303e0adbd1b2e8c60..130b65cb7b68a5bf8f0e2ea2249bf86c58059f1f 100644 (file)
--- a/src/knot/updates/zone-update.c
+++ b/src/knot/updates/zone-update.c
@@ -381,7 +381,7 @@ int zone_update_remove(zone_update_t *update, const knot_rrset_t *rrset)
                zone_node_t *n = NULL;
                knot_rrset_t *rrs_copy = knot_rrset_copy(rrset, &update->mm);
                int ret = zone_contents_remove_rr(update->new_cont, rrs_copy, &n);
-               knot_rrset_free(&rrs_copy, &update->mm);
+               knot_rrset_free(rrs_copy, &update->mm);
                return ret;
        } else {
                return KNOT_EINVAL;
@@ -525,7 +525,7 @@ static int set_new_soa(zone_update_t *update, unsigned serial_policy)
 
        int ret = zone_update_remove(update, soa_cpy);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&soa_cpy, NULL);
+               knot_rrset_free(soa_cpy, NULL);
        }
 
        uint32_t old_serial = knot_soa_serial(&soa_cpy->rrs);
@@ -539,7 +539,7 @@ static int set_new_soa(zone_update_t *update, unsigned serial_policy)
        knot_soa_serial_set(&soa_cpy->rrs, new_serial);
 
        ret = zone_update_add(update, soa_cpy);
-       knot_rrset_free(&soa_cpy, NULL);
+       knot_rrset_free(soa_cpy, NULL);
 
        return ret;
 }

diff --git a/src/knot/zone/zone-diff.c b/src/knot/zone/zone-diff.c
index edee2d9adcedb3292d9e415a842bf0bb3abb2c17..9f26e6ccde19456f1e34a675fc4586e8f0d3fda2 100644 (file)
--- a/src/knot/zone/zone-diff.c
+++ b/src/knot/zone/zone-diff.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ static int load_soas(const zone_contents_t *zone1, const zone_contents_t *zone2,
        }
        changeset->soa_to = knot_rrset_copy(&soa_rrset2, NULL);
        if (changeset->soa_to == NULL) {
-               knot_rrset_free(&changeset->soa_from, NULL);
+               knot_rrset_free(changeset->soa_from, NULL);
                return KNOT_ENOMEM;
        }
 

diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c
index 892e40311bb7da783c06a600803697295b015bce..d45bd7d69a504cde7f552f7728c7e7d3c1698bdc 100644 (file)
--- a/src/libknot/rrset.c
+++ b/src/libknot/rrset.c
@@ -60,7 +60,7 @@ knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, knot_mm_t *mm)
 
        int ret = knot_rdataset_copy(&rrset->rrs, &src->rrs, mm);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&rrset, mm);
+               knot_rrset_free(rrset, mm);
                return NULL;
        }
 
@@ -68,16 +68,14 @@ knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, knot_mm_t *mm)
 }
 
 _public_
-void knot_rrset_free(knot_rrset_t **rrset, knot_mm_t *mm)
+void knot_rrset_free(knot_rrset_t *rrset, knot_mm_t *mm)
 {
-       if (rrset == NULL || *rrset == NULL) {
+       if (rrset == NULL) {
                return;
        }
 
-       knot_rrset_clear(*rrset, mm);
-
-       mm_free(mm, *rrset);
-       *rrset = NULL;
+       knot_rrset_clear(rrset, mm);
+       mm_free(mm, rrset);
 }
 
 _public_

diff --git a/src/libknot/rrset.h b/src/libknot/rrset.h
index baf21900cf143755c2d8bc73eb5d3302f446d901..31e4bf5f6249fa55c9cc62bef6706551ee12d7c6 100644 (file)
--- a/src/libknot/rrset.h
+++ b/src/libknot/rrset.h
@@ -115,13 +115,11 @@ knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, knot_mm_t *mm);
 
 /*!
  * \brief Destroys the RRSet structure and all its substructures.
- )
- * Also sets the given pointer to NULL.
  *
  * \param rrset  RRset to be destroyed.
  * \param mm     Memory context.
  */
-void knot_rrset_free(knot_rrset_t **rrset, knot_mm_t *mm);
+void knot_rrset_free(knot_rrset_t *rrset, knot_mm_t *mm);
 
 /*!
  * \brief Frees structures inside RRSet, but not the RRSet itself.

diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index 4472d1744db440e3fe47bea083477521f968782b..1b8d60c34af8e8215cf2ba077122dcafa44d2df5 100644 (file)
--- a/src/libknot/tsig-op.c
+++ b/src/libknot/tsig-op.c
@@ -383,7 +383,7 @@ int knot_tsig_sign(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
                                   request_mac, request_mac_len,
                                   digest_tmp, &digest_tmp_len, tmp_tsig, key);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                return ret;
        }
 
@@ -395,13 +395,13 @@ int knot_tsig_sign(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
                                 msg_max_len - *msg_len, NULL);
        if (ret < 0) {
                *digest_len = 0;
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                return ret;
        }
 
        size_t tsig_wire_len = ret;
 
-       knot_rrset_free(&tmp_tsig, NULL);
+       knot_rrset_free(tmp_tsig, NULL);
 
        *msg_len += tsig_wire_len;
 
@@ -445,7 +445,7 @@ int knot_tsig_sign_next(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
        size_t wire_len = prev_digest_len + to_sign_len + KNOT_TSIG_TIMERS_LENGTH + 2;
        uint8_t *wire = malloc(wire_len);
        if (!wire) {
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                return KNOT_ENOMEM;
        }
        memset(wire, 0, wire_len);
@@ -462,13 +462,13 @@ int knot_tsig_sign_next(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
        int ret = compute_digest(wire, wire_len, digest_tmp, &digest_tmp_len, key);
        free(wire);
        if (ret != KNOT_EOK) {
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                *digest_len = 0;
                return ret;
        }
 
        if (digest_tmp_len > *digest_len) {
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                *digest_len = 0;
                return KNOT_ESPACE;
        }
@@ -485,14 +485,14 @@ int knot_tsig_sign_next(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
        ret = knot_rrset_to_wire(tmp_tsig, msg + *msg_len,
                                 msg_max_len - *msg_len, NULL);
        if (ret < 0) {
-               knot_rrset_free(&tmp_tsig, NULL);
+               knot_rrset_free(tmp_tsig, NULL);
                *digest_len = 0;
                return ret;
        }
 
        size_t tsig_wire_size = ret;
 
-       knot_rrset_free(&tmp_tsig, NULL);
+       knot_rrset_free(tmp_tsig, NULL);
 
        *msg_len += tsig_wire_size;
        uint16_t arcount = knot_wire_get_arcount(msg);
@@ -659,7 +659,7 @@ int knot_tsig_add(uint8_t *msg, size_t *msg_len, size_t msg_max_len,
        int ret = knot_tsig_append(msg, msg_len, msg_max_len, tmp_tsig);
 
        /* key_name already referenced in RRSet, no need to free separately. */
-       knot_rrset_free(&tmp_tsig, NULL);
+       knot_rrset_free(tmp_tsig, NULL);
 
        return ret;
 }

diff --git a/src/utils/common/exec.c b/src/utils/common/exec.c
index bb5be9a13f32dfa4645957300cc94dd225a2c904..e1058011c32d2471d3c96390900878e27374aa72 100644 (file)
--- a/src/utils/common/exec.c
+++ b/src/utils/common/exec.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -316,7 +316,7 @@ static void print_section_question(const knot_dname_t *owner,
 
        printf("%s\n", buf);
 
-       knot_rrset_free(&question, NULL);
+       knot_rrset_free(question, NULL);
        free(buf);
 }
 

diff --git a/src/utils/kdig/kdig_exec.c b/src/utils/kdig/kdig_exec.c
index 813453747e29d29d8865e0bf12d540c896e269e8..ddb84fd79415a12dcdaabaadf3bc15dbd4e984e9 100644 (file)
--- a/src/utils/kdig/kdig_exec.c
+++ b/src/utils/kdig/kdig_exec.c
@@ -451,7 +451,7 @@ static knot_pkt_t *create_query_packet(const query_t *query)
                // Fill in blank SOA rdata to rrset.
                ret = knot_rrset_add_rdata(soa, wire, sizeof(wire), &packet->mm);
                if (ret != KNOT_EOK) {
-                       knot_rrset_free(&soa, &packet->mm);
+                       knot_rrset_free(soa, &packet->mm);
                        knot_pkt_free(packet);
                        return NULL;
                }
@@ -461,7 +461,7 @@ static knot_pkt_t *create_query_packet(const query_t *query)
 
                ret = knot_pkt_put(packet, KNOT_COMPR_HINT_NONE, soa, KNOT_PF_FREE);
                if (ret != KNOT_EOK) {
-                       knot_rrset_free(&soa, &packet->mm);
+                       knot_rrset_free(soa, &packet->mm);
                        knot_pkt_free(packet);
                        return NULL;
                }

diff --git a/src/utils/knsupdate/knsupdate_exec.c b/src/utils/knsupdate/knsupdate_exec.c
index 8ada779bfc4784a612cc95bd29de3b7cf8d451e5..0cb255c64a5568bf08de7c7076f8844e8e1dd4a0 100644 (file)
--- a/src/utils/knsupdate/knsupdate_exec.c
+++ b/src/utils/knsupdate/knsupdate_exec.c
@@ -353,12 +353,12 @@ static int rr_list_append(zs_scanner_t *s, list_t *target_list, knot_mm_t *mm)
        if (ret != KNOT_EOK) {
                DBG("%s: failed to set rrset from wire (%s)\n",
                    __func__, knot_strerror(ret));
-               knot_rrset_free(&rr, NULL);
+               knot_rrset_free(rr, NULL);
                return ret;
        }
 
        if (ptrlist_add(target_list, rr, mm) == NULL) {
-               knot_rrset_free(&rr, NULL);
+               knot_rrset_free(rr, NULL);
                return KNOT_ENOMEM;
        }
 

diff --git a/src/utils/knsupdate/knsupdate_params.c b/src/utils/knsupdate/knsupdate_params.c
index f1b067e366c4f6e17f41a3f34ffe298b03df6ffa..f2eee91990df0265adf672d2fee54758380ed6e5 100644 (file)
--- a/src/utils/knsupdate/knsupdate_params.c
+++ b/src/utils/knsupdate/knsupdate_params.c
@@ -164,7 +164,7 @@ static void rr_list_free(list_t *list, knot_mm_t *mm)
        ptrnode_t *node = NULL;
        WALK_LIST(node, *list) {
                knot_rrset_t *rrset = (knot_rrset_t *)node->d;
-               knot_rrset_free(&rrset, NULL);
+               knot_rrset_free(rrset, NULL);
        }
        ptrlist_free(list, mm);
 }

diff --git a/tests/libknot/test_pkt.c b/tests/libknot/test_pkt.c
index fb63c0f2cef03beab4a6d8bdd6c2ed8ec58f0f61..4f0fdf59ce59a576b541b4da155a0a88a34e072a 100644 (file)
--- a/tests/libknot/test_pkt.c
+++ b/tests/libknot/test_pkt.c
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
        /* Free extra data. */
        for (unsigned i = 0; i < NAMECOUNT; ++i) {
-               knot_rrset_free(&rrsets[i], NULL);
+               knot_rrset_free(rrsets[i], NULL);
        }
        free(tsig_key.secret.data);
        mp_delete((struct mempool *)mm.ctx);

diff --git a/tests/libknot/test_rrset.c b/tests/libknot/test_rrset.c
index a58169ac1884cc592b9004a7eff2ed4a16d75a78..487d4ef974585633f89648967c54c46f1bfda646 100644 (file)
--- a/tests/libknot/test_rrset.c
+++ b/tests/libknot/test_rrset.c
@@ -36,7 +36,7 @@ static bool check_rrset(const knot_rrset_t *rrset, const knot_dname_t *owner,
 
 int main(int argc, char *argv[])
 {
-       plan(19);
+       plan_lazy();
 
        // Test new
        knot_dname_t *dummy_owner = knot_dname_from_str_alloc("test.");
@@ -110,9 +110,8 @@ int main(int argc, char *argv[])
        ok(check_rrset(rrset, NULL, 0, KNOT_CLASS_IN, 0), "rrset: init empty.");
 
        // "Test" freeing
-       knot_rrset_free(&rrset, NULL);
-       knot_rrset_free(&copy, NULL);
-       ok(rrset == NULL && copy == NULL, "rrset: free.");
+       knot_rrset_free(rrset, NULL);
+       knot_rrset_free(copy, NULL);
 
        return 0;
 }

diff --git a/tests/test_changeset.c b/tests/test_changeset.c
index 1ee13e71fe94a27af26df2dbab45fbc8b0cedb17..2cd46e9d5d9236e5d272245278b78c9c51f28e7f 100644 (file)
--- a/tests/test_changeset.c
+++ b/tests/test_changeset.c
@@ -180,9 +180,9 @@ int main(int argc, char *argv[])
        ok(changeset_empty(ch2), "changeset: clear list");
        free(ch2);
 
-       knot_rrset_free(&apex_txt_rr, NULL);
-       knot_rrset_free(&apex_spf_rr, NULL);
-       knot_rrset_free(&other_rr, NULL);
+       knot_rrset_free(apex_txt_rr, NULL);
+       knot_rrset_free(apex_spf_rr, NULL);
+       knot_rrset_free(other_rr, NULL);
 
        return 0;
 }

diff --git a/tests/test_journal.c b/tests/test_journal.c
index 6aa667d48788600ab54fc6e5ccbee1928b4cbc58..8c00997411ff13f829d5d6a886d187cba27c4feb 100644 (file)
--- a/tests/test_journal.c
+++ b/tests/test_journal.c
@@ -154,13 +154,13 @@ static void changeset_set_soa_serials(changeset_t *ch, uint32_t from, uint32_t t
        knot_rrset_t soa;
 
        init_soa(&soa, from, apex);
-       knot_rrset_free(&ch->soa_from, NULL);
+       knot_rrset_free(ch->soa_from, NULL);
        ch->soa_from = knot_rrset_copy(&soa, NULL);
        assert(ch->soa_from);
        knot_rrset_clear(&soa, NULL);
 
        init_soa(&soa, to, apex);
-       knot_rrset_free(&ch->soa_to, NULL);
+       knot_rrset_free(ch->soa_to, NULL);
        ch->soa_to = knot_rrset_copy(&soa, NULL);
        assert(ch->soa_to);
        knot_rrset_clear(&soa, NULL);
@@ -518,9 +518,9 @@ static knot_rrset_t * tm_rrs(const knot_dname_t * apex, int x)
        static knot_rrset_t * rrsC = NULL;
 
        if (apex == NULL) {
-               knot_rrset_free(&rrsA, NULL);
-               knot_rrset_free(&rrsB, NULL);
-               knot_rrset_free(&rrsC, NULL);
+               knot_rrset_free(rrsA, NULL);
+               knot_rrset_free(rrsB, NULL);
+               knot_rrset_free(rrsC, NULL);
                rrsA = rrsB = rrsC = NULL;
                return NULL;
        }

diff --git a/tests/test_node.c b/tests/test_node.c
index 2d7dcd9b909a55f9df9e62569c7e08029a4d4c8a..9c776b1fce8c91b3d0cb5820f6d8682c06ed24a0 100644 (file)
--- a/tests/test_node.c
+++ b/tests/test_node.c
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
        ok(n_rrset && knot_rrset_equal(n_rrset, dummy_rrset, KNOT_RRSET_COMPARE_WHOLE),
           "Node: create existing RRSet.");
 
-       knot_rrset_free(&n_rrset, NULL);
+       knot_rrset_free(n_rrset, NULL);
 
        n_rrset = node_create_rrset(node, KNOT_RRTYPE_SOA);
        ok(n_rrset == NULL, "Node: create non-existing RRSet.");
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
        ok(ret == KNOT_ETTL && node->rrset_count == 1,
           "Node: add RRSet, TTL mismatch.");
 
-       knot_rrset_free(&dummy_rrset, NULL);
+       knot_rrset_free(dummy_rrset, NULL);
 
        // Test bool functions
        ok(node_rrtype_exists(node, KNOT_RRTYPE_TXT), "Node: type exists.");
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 
        ok(node_rrtype_is_signed(node, KNOT_RRTYPE_TXT), "Node: type is signed.");
 
-       knot_rrset_free(&dummy_rrset, NULL);
+       knot_rrset_free(dummy_rrset, NULL);
 
        // Test remove RRset
        node_remove_rdataset(node, KNOT_RRTYPE_AAAA);

diff --git a/tests/test_server.h b/tests/test_server.h
index 11ec82d46f5db9266e80d3a6d712e7008ea54d98..4a6e4274c5b2855bee8be2586440c72365f29d43 100644 (file)
--- a/tests/test_server.h
+++ b/tests/test_server.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ static inline void create_root_zone(server_t *server, knot_mm_t *mm)
                                           7200, mm);
        knot_rrset_add_rdata(soa, SOA_RDATA, SOA_RDLEN, mm);
        node_add_rrset(root->contents->apex, soa, NULL);
-       knot_rrset_free(&soa, mm);
+       knot_rrset_free(soa, mm);
 
        /* Bake the zone. */
        zone_contents_adjust_full(root->contents);