]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
no double free.
authorWouter Wijngaards <wouter@nlnetlabs.nl>
Wed, 15 Feb 2012 15:33:24 +0000 (15:33 +0000)
committerWouter Wijngaards <wouter@nlnetlabs.nl>
Wed, 15 Feb 2012 15:33:24 +0000 (15:33 +0000)
git-svn-id: file:///svn/unbound/trunk@2627 be551aaa-1e26-0410-a405-d3ace91eadb9

daemon/remote.c

index 9c683bc75784fec8d4a8bbebf3a2f76aa053b2b4..61c8b78e58b0362999726ba46312ede704071f56 100644 (file)
@@ -1480,9 +1480,8 @@ do_forward_add(SSL* ssl, struct worker* worker, char* args)
        int insecure = 0;
        uint8_t* nm = NULL;
        struct delegpt* dp = NULL;
-       if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, NULL)) {
+       if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, NULL))
                return;
-       }
        if(insecure) {
                if(!anchors_add_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
                        nm)) {
@@ -1509,10 +1508,8 @@ do_forward_remove(SSL* ssl, struct worker* worker, char* args)
        struct iter_forwards* fwd = worker->env.fwds;
        int insecure = 0;
        uint8_t* nm = NULL;
-       if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL)) {
-               free(nm);
+       if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL))
                return;
-       }
        if(insecure)
                anchors_delete_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
                        nm);
@@ -1542,9 +1539,8 @@ do_stub_add(SSL* ssl, struct worker* worker, char* args)
        int insecure = 0, prime = 0;
        uint8_t* nm = NULL;
        struct delegpt* dp = NULL;
-       if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, &prime)) {
+       if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, &prime))
                return;
-       }
        if(insecure) {
                if(!anchors_add_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
                        nm)) {
@@ -1583,10 +1579,8 @@ do_stub_remove(SSL* ssl, struct worker* worker, char* args)
        struct iter_hints* hints = get_iter_hints(worker);
        int insecure = 0;
        uint8_t* nm = NULL;
-       if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL)) {
-               free(nm);
+       if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL))
                return;
-       }
        if(insecure)
                anchors_delete_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
                        nm);