Cleanup stray goto labels from removing isc_mem_allocate/strdup checking blocks

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 9ccd7e5c451454761f8ae2391f092d535c836c8b..efb34e52061b797ae13d9d1aeadc91a94f0c0b95 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -733,12 +733,6 @@ controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
                newstr = NULL;
        }
        return (ISC_R_SUCCESS);
-
- cleanup:
-       if (newstr != NULL)
-               isc_mem_free(mctx, newstr);
-       free_controlkeylist(keyids, mctx);
-       return (ISC_R_NOMEMORY);
 }
 
 static void

diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c
index 153885f979ee2471ebfc19d363e9b3d2faa8a36b..fb6c1a75b55bbcec92a3919bb68dde0527839cd1 100644 (file)
--- a/contrib/dlz/drivers/dlz_filesystem_driver.c
+++ b/contrib/dlz/drivers/dlz_filesystem_driver.c
@@ -926,9 +926,6 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[],
        /* return success */
        return (ISC_R_SUCCESS);
 
-       /* handle no memory error */
- no_mem:
-
        /* if we allocated a config data object clean it up */
        if (cd != NULL)
                fs_destroy(NULL, cd);

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 92f93a554ce232aaedb627cf489f92bb76407351..9a767aa0d3a9a93a3a2681c4b10670731acbbbe9 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -302,10 +302,8 @@ cleanup_dbargv:
        isc_mem_free(cmctx, cache->db_type);
 cleanup_filelock:
        isc_mutex_destroy(&cache->filelock);
-cleanup_stats:
        isc_stats_detach(&cache->stats);
        isc_mutex_destroy(&cache->lock);
-cleanup_mem:
        if (cache->name != NULL) {
                isc_mem_free(cmctx, cache->name);
        }

diff --git a/lib/dns/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c
index cbc810cfc5184aff01fa7563935d547e325f3532..de3dd1574a6a6172b4d618de7ba781fafc31adf5 100644 (file)
--- a/lib/dns/pkcs11ecdsa_link.c
+++ b/lib/dns/pkcs11ecdsa_link.c
@@ -682,27 +682,8 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
        isc_buffer_forward(data, len);
        key->keydata.pkey = ec;
        key->key_size = len * 4;
-       return (ISC_R_SUCCESS);
 
- nomemory:
-       for (attr = pk11_attribute_first(ec);
-            attr != NULL;
-            attr = pk11_attribute_next(ec, attr))
-               switch (attr->type) {
-               case CKA_EC_PARAMS:
-               case CKA_EC_POINT:
-                       FREECURVE();
-                       break;
-               }
-       if (ec->repr != NULL) {
-               memset(ec->repr, 0, ec->attrcnt * sizeof(*attr));
-               isc_mem_put(key->mctx,
-                           ec->repr,
-                           ec->attrcnt * sizeof(*attr));
-       }
-       memset(ec, 0, sizeof(*ec));
-       isc_mem_put(key->mctx, ec, sizeof(*ec));
-       return (ISC_R_NOMEMORY);
+       return (ISC_R_SUCCESS);
 }
 
 static isc_result_t

diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
index cc6e95756d72641b2a4dbc466c4ae0421f22a254..2a1fde7b9d2bfa2e93f2db3f153d697e09625e3d 100644 (file)
--- a/lib/dns/pkcs11rsa_link.c
+++ b/lib/dns/pkcs11rsa_link.c
@@ -1379,33 +1379,6 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
        key->keydata.pkey = rsa;
 
        return (ISC_R_SUCCESS);
-
-    nomemory:
-       for (attr = pk11_attribute_first(rsa);
-            attr != NULL;
-            attr = pk11_attribute_next(rsa, attr))
-               switch (attr->type) {
-               case CKA_MODULUS:
-               case CKA_PUBLIC_EXPONENT:
-                       if (attr->pValue != NULL) {
-                               isc_safe_memwipe(attr->pValue,
-                                                attr->ulValueLen);
-                               isc_mem_put(key->mctx,
-                                           attr->pValue,
-                                           attr->ulValueLen);
-                       }
-                       break;
-               }
-       if (rsa->repr != NULL) {
-               isc_safe_memwipe(rsa->repr,
-                                rsa->attrcnt * sizeof(*attr));
-               isc_mem_put(key->mctx,
-                           rsa->repr,
-                           rsa->attrcnt * sizeof(*attr));
-       }
-       isc_safe_memwipe(rsa, sizeof(*rsa));
-       isc_mem_put(key->mctx, rsa, sizeof(*rsa));
-       return (ISC_R_NOMEMORY);
 }
 
 static isc_result_t
@@ -1549,7 +1522,6 @@ pkcs11rsa_tofile(const dst_key_t *key, const char *directory) {
 
        priv.nelements = i;
        result = dst__privstruct_writefile(key, &priv, directory);
- fail:
        for (i = 0; i < 10; i++) {
                if (bufs[i] == NULL)
                        break;

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index d13052375dedb066a2a6581bf7e60edec63bf1f5..b2265e97edb005e4b9b207dd4f389d510a06d6e9 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5028,8 +5028,6 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
 
  cleanup_info:
        isc_mem_free(mctx, fctx->info);
-
- cleanup_counter:
        isc_counter_detach(&fctx->qc);
 
  cleanup_fetch:

diff --git a/lib/dns/view.c b/lib/dns/view.c
index ee21465f83fe9dcf6c7253ed6a8280ccb15fbb00..d906ee6be373ddf44abb7765c35c825fdb67273f 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -326,8 +326,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 
  cleanup_name:
        isc_mem_free(mctx, view->name);
-
- cleanup_view:
        isc_mem_putanddetach(&view->mctx, view, sizeof(*view));
 
        return (result);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index b035da7dab286c0db6b576caa670b42879f65384..e808ef076b697f58bcaa7cbeda2d1956af35589c 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1467,21 +1467,9 @@ dns_zone_setdbtype(dns_zone_t *zone,
        zone->db_argc = dbargc;
        zone->db_argv = argv;
        result = ISC_R_SUCCESS;
-       goto unlock;
 
- nomem:
-       if (argv != NULL) {
-               for (i = 0; i < dbargc; i++) {
-                       if (argv[i] != NULL) {
-                               isc_mem_free(zone->mctx, argv[i]);
-                       }
-               }
-               isc_mem_put(zone->mctx, argv, dbargc * sizeof(*argv));
-       }
-       result = ISC_R_NOMEMORY;
-
- unlock:
        UNLOCK_ZONE(zone);
+
        return (result);
 }