Remove redundant resets of variables after free()

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

diff --git a/lib/auth.c b/lib/auth.c
index dd3fc861fb7afc9b3220c323a24a10425bcbae4e..4a0e38b444d3b1dc2b59bde580d90b2d3f30f35f 100644 (file)
--- a/lib/auth.c
+++ b/lib/auth.c
@@ -372,8 +372,6 @@ void _gnutls_free_auth_info(gnutls_session_t session)
 
                        gnutls_free(info->raw_certificate_list);
                        gnutls_free(info->raw_ocsp_list);
-                       info->raw_certificate_list = NULL;
-                       info->raw_ocsp_list = NULL;
                        info->ncerts = 0;
                        info->nocsp = 0;
 
@@ -390,7 +388,6 @@ void _gnutls_free_auth_info(gnutls_session_t session)
        }
 
        gnutls_free(session->key.auth_info);
-       session->key.auth_info = NULL;
        session->key.auth_info_size = 0;
        session->key.auth_info_type = 0;
 

diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index d5d0943242675298ff3e4610c81019acfea61b55..e58b0a1331b0e5362a6d7ab79f6d42a701d2e115 100644 (file)
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -200,9 +200,8 @@ proc_rsa_client_kx(gnutls_session_t session, uint8_t * data,
        ret = gnutls_rnd(GNUTLS_RND_NONCE, session->key.key.data,
                         GNUTLS_MASTER_SIZE);
        if (ret < 0) {
-                gnutls_free(session->key.key.data);
-                session->key.key.data = NULL;
-                session->key.key.size = 0;
+               gnutls_free(session->key.key.data);
+               session->key.key.size = 0;
                gnutls_assert();
                return ret;
        }

diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c
index 791fcd8bb702d68201d72b42e310cabff14cfb82..387bfd403e4c86a7653df0723dd103b65cd2eb5a 100644 (file)
--- a/lib/auth/rsa_psk.c
+++ b/lib/auth/rsa_psk.c
@@ -341,7 +341,6 @@ _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, uint8_t * data,
                    ("auth_rsa_psk: Possible PKCS #1 format attack\n");
                if (ret >= 0) {
                        gnutls_free(plaintext.data);
-                       plaintext.data = NULL;
                }
                randomize_key = 1;
        } else {

diff --git a/lib/auth/srp_sb64.c b/lib/auth/srp_sb64.c
index 1177e76719da4c8d9cbdbb6921b32661df94ca13..7bfffdf0700899830381ca6c07d2530c4d3c10bb 100644 (file)
--- a/lib/auth/srp_sb64.c
+++ b/lib/auth/srp_sb64.c
@@ -263,7 +263,6 @@ _gnutls_sbase64_decode(char *data, size_t idata_size, uint8_t ** result)
                tmp = decode(tmpres, datrev);
                if (tmp < 0) {
                        gnutls_free((*result));
-                       *result = NULL;
                        return tmp;
                }
 
@@ -277,7 +276,6 @@ _gnutls_sbase64_decode(char *data, size_t idata_size, uint8_t ** result)
                tmp = decode(tmpres, (uint8_t *) & data[i]);
                if (tmp < 0) {
                        gnutls_free((*result));
-                       *result = NULL;
                        return tmp;
                }
                memcpy(&(*result)[j], tmpres, tmp);

diff --git a/lib/cert-cred-x509.c b/lib/cert-cred-x509.c
index 257f1b989ab68cedbcee6be3a728ad07000f77a0..925c09b3d5c3a8f3dcc3cfac6da9d3352ddd2a0e 100644 (file)
--- a/lib/cert-cred-x509.c
+++ b/lib/cert-cred-x509.c
@@ -265,7 +265,6 @@ parse_pem_cert_mem(gnutls_certificate_credentials_t res,
            gnutls_pcert_import_x509_list(pcerts, unsorted, &ncerts, GNUTLS_X509_CRT_LIST_SORT);
        if (ret < 0) {
                gnutls_free(pcerts);
-               pcerts = NULL;
                gnutls_assert();
                goto cleanup;
        }
@@ -508,7 +507,6 @@ read_cert_url(gnutls_certificate_credentials_t res, gnutls_privkey_t key, const
                        goto cleanup;
                }
                gnutls_free(t.data);
-               t.data = NULL;
        }
 
        ret = _gnutls_certificate_credential_append_keypair(res, key, names, ccert, count);
@@ -908,7 +906,6 @@ gnutls_certificate_get_x509_crt(gnutls_certificate_credentials_t res,
                        while (i--)
                                gnutls_x509_crt_deinit((*crt_list)[i]);
                        gnutls_free(*crt_list);
-                       *crt_list = NULL;
 
                        return gnutls_assert_val(ret);
                }

diff --git a/lib/cert-cred.c b/lib/cert-cred.c
index f04ded4c0437fe241c536053c92b56dc10260ae4..35183b7cc720f365bfd10707a23a666aa14bc4d5 100644 (file)
--- a/lib/cert-cred.c
+++ b/lib/cert-cred.c
@@ -258,7 +258,6 @@ void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc)
 
                for (j = 0; j < sc->certs[i].ocsp_data_length; j++) {
                        gnutls_free(sc->certs[i].ocsp_data[j].response.data);
-                       sc->certs[i].ocsp_data[j].response.data = NULL;
                }
                _gnutls_str_array_clear(&sc->certs[i].names);
                gnutls_privkey_deinit(sc->certs[i].pkey);
@@ -266,8 +265,6 @@ void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc)
 
        gnutls_free(sc->certs);
        gnutls_free(sc->sorted_cert_idx);
-       sc->certs = NULL;
-       sc->sorted_cert_idx = NULL;
 
        sc->ncerts = 0;
 }

diff --git a/lib/hello_ext.c b/lib/hello_ext.c
index 2d7cd806f622f1dbc5735b89b8921c8b566d724d..0a8d4004a3fd222430ca2ea567105d671b370da8 100644 (file)
--- a/lib/hello_ext.c
+++ b/lib/hello_ext.c
@@ -464,9 +464,8 @@ void _gnutls_hello_ext_deinit(void)
                        continue;
 
                if (extfunc[i]->free_struct != 0) {
-                       gnutls_free((void*)extfunc[i]->name);
-                       gnutls_free((void*)extfunc[i]);
-                       extfunc[i] = NULL;
+                       gnutls_free(((hello_ext_entry_st *)extfunc[i])->name);
+                       gnutls_free(extfunc[i]);
                }
        }
 }

diff --git a/lib/mpi.c b/lib/mpi.c
index 2bc970d7cd88d3ae644f486dac69d95b7a23ae3e..ed208d511daccdf381c60d6856543d2434f9ef25 100644 (file)
--- a/lib/mpi.c
+++ b/lib/mpi.c
@@ -88,7 +88,6 @@ _gnutls_mpi_random_modp(bigint_t r, bigint_t p,
 
        if (buf_release != 0) {
                gnutls_free(buf);
-               buf = NULL;
        }
 
        if (r != NULL) {

diff --git a/lib/nettle/mpi.c b/lib/nettle/mpi.c
index 8a93ac2786fe0e17661fca379cba5e5f4a41eb76..96bec4aa43e565d9903f656383a9dbec8cda2dcc 100644 (file)
--- a/lib/nettle/mpi.c
+++ b/lib/nettle/mpi.c
@@ -122,7 +122,6 @@ static int wrap_nettle_mpi_init_multi(bigint_t *w, ...)
 fail:
        mpz_clear(TOMPZ(*w));
        gnutls_free(*w);
-       *w = NULL;
 
        va_start(args, w);
        
@@ -131,7 +130,6 @@ fail:
                if (next != last_failed) {
                        mpz_clear(TOMPZ(*next));
                        gnutls_free(*next);
-                       *next = NULL;
                }
        } while(next != last_failed);
        

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 38c098d8d58a8390750c530e9604caef8e610dc3..5b109ee475541d3d03d665d324d02edc9cfc73bd 100644 (file)
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -371,7 +371,6 @@ dh_cleanup:
 
                        if (_gnutls_mem_is_zero(out->data, out->size)) {
                                gnutls_free(out->data);
-                               out->data = NULL;
                                gnutls_assert();
                                ret = GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER;
                                goto cleanup;
@@ -2254,8 +2253,6 @@ wrap_nettle_pk_generate_keys(gnutls_pk_algorithm_t algo,
        params->params_nr = 0;
        gnutls_free(params->raw_priv.data);
        gnutls_free(params->raw_pub.data);
-       params->raw_priv.data = NULL;
-       params->raw_pub.data = NULL;
 
        FAIL_IF_LIB_ERROR;
        return ret;

diff --git a/lib/ocsp-api.c b/lib/ocsp-api.c
index d18a1f0c2cb6f83f8019d452223318fc3728ff07..a0005e99d47030e79674619fe17e23fd03bec75d 100644 (file)
--- a/lib/ocsp-api.c
+++ b/lib/ocsp-api.c
@@ -473,7 +473,6 @@ gnutls_certificate_set_ocsp_status_request_mem(gnutls_certificate_credentials_t
                        nresp++;
 
                        gnutls_free(der.data);
-                       der.data = NULL;
 
                        p.data++;
                        p.size--;

diff --git a/lib/pk.c b/lib/pk.c
index 1f137f71cbfa6a024515f9634a7e0398c2e51f21..a5bb58b73f0274783f620837b06359b7bf9d1667 100644 (file)
--- a/lib/pk.c
+++ b/lib/pk.c
@@ -537,8 +537,6 @@ void gnutls_pk_params_release(gnutls_pk_params_st * p)
        }
        gnutls_free(p->raw_priv.data);
        gnutls_free(p->raw_pub.data);
-       p->raw_priv.data = NULL;
-       p->raw_pub.data = NULL;
 
        p->params_nr = 0;
 }

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 80d7c57b1fcad474fd2be441636e222bfcf2d8eb..b227c0200e273902ad6c869df1aec93b7410f271 100644 (file)
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1236,7 +1236,6 @@ int gnutls_pkcs11_obj_init(gnutls_pkcs11_obj_t * obj)
        (*obj)->info = p11_kit_uri_new();
        if ((*obj)->info == NULL) {
                gnutls_free(*obj);
-               *obj = NULL;
                gnutls_assert();
                return GNUTLS_E_MEMORY_ERROR;
        }

diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 53a2d8a937f95dca9a39cf3eceb8a85d6390aacd..ca45bb60d509066fe3a102506b5ceea6de5e94f3 100644 (file)
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -443,7 +443,6 @@ _gnutls_pkcs11_privkey_sign(gnutls_pkcs11_privkey_t key,
                }
 
                gnutls_free(tmp.data);
-               tmp.data = NULL;
        } else {
                signature->size = siglen;
                signature->data = tmp.data;
@@ -521,10 +520,8 @@ gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey,
 
        memset(&pkey->sinfo, 0, sizeof(pkey->sinfo));
 
-       if (pkey->url) {
+       if (pkey->url)
                gnutls_free(pkey->url);
-               pkey->url = NULL;
-       }
 
        if (pkey->uinfo) {
                p11_kit_uri_free(pkey->uinfo);
@@ -621,7 +618,6 @@ gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey,
                pkey->uinfo = NULL;
        }
        gnutls_free(pkey->url);
-       pkey->url = NULL;
 
        return ret;
 }

diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index 4a83018fd87032c81215e49fa99a62d58daa88d1..49a47ebf8b938d23e659fed0fe7ee28d944a5c5e 100644 (file)
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -268,7 +268,6 @@ static void clean_pubkey(struct ck_attribute *a, unsigned a_val)
                        case CKA_EC_PARAMS:
                        case CKA_EC_POINT:
                                gnutls_free(a[i].value);
-                               a[i].value = NULL;
                                break;
                }
        }

diff --git a/lib/session_pack.c b/lib/session_pack.c
index da74f45e0c446008d2d7f7c795d1e4fa436226dc..3842ed4c4de11370823780f7e9e69da77e42edea 100644 (file)
--- a/lib/session_pack.c
+++ b/lib/session_pack.c
@@ -574,8 +574,6 @@ unpack_certificate_auth_info(gnutls_session_t session,
 
                gnutls_free(info->raw_certificate_list);
                gnutls_free(info->raw_ocsp_list);
-               info->raw_certificate_list = NULL;
-               info->raw_ocsp_list = NULL;
        }
 
        return ret;

diff --git a/lib/srp.c b/lib/srp.c
index 27a28f2aab0c27b4d969ae1d5b03e8ab4f152a02..ab00fa245638f01d4584c24a2041539ee479dc00 100644 (file)
--- a/lib/srp.c
+++ b/lib/srp.c
@@ -609,7 +609,6 @@ gnutls_srp_set_server_credentials_file(gnutls_srp_server_credentials_t res,
        if (res->password_conf_file == NULL) {
                gnutls_assert();
                gnutls_free(res->password_file);
-               res->password_file = NULL;
                return GNUTLS_E_MEMORY_ERROR;
        }
 

diff --git a/lib/str.c b/lib/str.c
index 7757730175ad9f00243dbdc2d5958220ff65ec19..4a89de227eda9455a37f670296284d1de17a0d2b 100644 (file)
--- a/lib/str.c
+++ b/lib/str.c
@@ -80,7 +80,7 @@ void _gnutls_buffer_clear(gnutls_buffer_st * str)
                return;
        gnutls_free(str->allocd);
 
-       str->data = str->allocd = NULL;
+       str->data = NULL;
        str->max_length = 0;
        str->length = 0;
 }

diff --git a/lib/tls13/certificate_request.c b/lib/tls13/certificate_request.c
index 4efeee0377bc4aa77110c9f143b3d420335e34d1..50602e23385a0574de3fda0f80884d03b53e80ab 100644 (file)
--- a/lib/tls13/certificate_request.c
+++ b/lib/tls13/certificate_request.c
@@ -152,7 +152,6 @@ int _gnutls13_recv_certificate_request_int(gnutls_session_t session, gnutls_buff
                        return gnutls_assert_val(ret);
 
                gnutls_free(session->internals.post_handshake_cr_context.data);
-               session->internals.post_handshake_cr_context.data = NULL;
                ret = _gnutls_set_datum(&session->internals.post_handshake_cr_context,
                                        context.data, context.size);
                if (ret < 0)
@@ -279,7 +278,6 @@ int _gnutls13_send_certificate_request(gnutls_session_t session, unsigned again)
                        }
 
                        gnutls_free(session->internals.post_handshake_cr_context.data);
-                       session->internals.post_handshake_cr_context.data = NULL;
                        ret = _gnutls_set_datum(&session->internals.post_handshake_cr_context,
                                                rnd, sizeof(rnd));
                        if (ret < 0) {

diff --git a/lib/tpm.c b/lib/tpm.c
index b97968838b80a14e7255ecf035182db3575732d3..8204fd8bd2d4867bf2ee09f361860062078b398c 100644 (file)
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -1641,10 +1641,8 @@ gnutls_tpm_privkey_generate(gnutls_pk_algorithm_t pk, unsigned int bits,
        gnutls_pubkey_deinit(pub);
       privkey_cleanup:
        gnutls_free(privkey->data);
-       privkey->data = NULL;
       cleanup:
        gnutls_free(tmpkey.data);
-       tmpkey.data = NULL;
       err_sa:
        pTspi_Context_CloseObject(s.tpm_ctx, key_ctx);
       err_cc:

diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index a52c4aa428dffeb747d685755fa7107a7cc36f09..a8edf30ec6c60c62681390f15d48d5179302a7a3 100644 (file)
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -162,7 +162,6 @@ void gnutls_ocsp_resp_deinit(gnutls_ocsp_resp_t resp)
                asn1_delete_structure(&resp->basicresp);
 
        resp->resp = NULL;
-       resp->response_type_oid.data = NULL;
        resp->basicresp = NULL;
 
        gnutls_free(resp->der.data);
@@ -299,7 +298,6 @@ gnutls_ocsp_resp_import2(gnutls_ocsp_resp_t resp,
                }
 
                gnutls_free(resp->der.data);
-               resp->der.data = NULL;
        }
 
        resp->init = 1;
@@ -1668,18 +1666,12 @@ gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_t resp,
 
        return GNUTLS_E_SUCCESS;
  fail:
-       if (issuer_name_hash) {
+       if (issuer_name_hash)
                gnutls_free(issuer_name_hash->data);
-               issuer_name_hash->data = NULL;
-       }
-       if (issuer_key_hash) {
+       if (issuer_key_hash)
                gnutls_free(issuer_key_hash->data);
-               issuer_key_hash->data = NULL;
-       }
-       if (serial_number) {
+       if (serial_number)
                gnutls_free(serial_number->data);
-               serial_number->data = NULL;
-       }
        return ret;
 }
 
@@ -1955,7 +1947,6 @@ gnutls_ocsp_resp_get_certs(gnutls_ocsp_resp_t resp,
                }
 
                gnutls_free(c.data);
-               c.data = NULL;
        }
 
        tmpcerts[ctr] = NULL;

diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 26d2142ea01c1d09974f82addca0fb7b4ceb6c76..35d12ac4b9bbfc0b329499c920b40c42c51486b0 100644 (file)
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -62,7 +62,6 @@ static inline void _pkcs12_bag_free_data(gnutls_pkcs12_bag_t bag)
                _gnutls_free_datum(&bag->element[i].data);
                _gnutls_free_datum(&bag->element[i].local_key_id);
                gnutls_free(bag->element[i].friendly_name);
-               bag->element[i].friendly_name = NULL;
                bag->element[i].type = 0;
        }
 

diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c
index c2b00e61c113d5e097d25f632ab4eb1adbeea67f..39eb7784be31f57e742b455e804bc2cfe03083c3 100644 (file)
--- a/lib/x509/pkcs7-crypt.c
+++ b/lib/x509/pkcs7-crypt.c
@@ -1269,7 +1269,6 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
            _gnutls_cipher_init(&ch, ce, &dkey, &d_iv, 0);
 
        gnutls_free(key);
-       key = NULL;
 
        if (ret < 0) {
                gnutls_assert();

diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 37e2cc3a51b7ed014bf2e9acb78c9c1c889fb55d..bfb464a470b790e7381563410cdf777dbfebef14 100644 (file)
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -692,7 +692,6 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
 
                ret = gnutls_pkcs7_add_attr(&info->signed_attrs, oid, &tmp, 0);
                gnutls_free(tmp.data);
-               tmp.data = NULL;
 
                if (ret < 0) {
                        gnutls_assert();
@@ -730,7 +729,6 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                ret =
                    gnutls_pkcs7_add_attr(&info->unsigned_attrs, oid, &tmp, 0);
                gnutls_free(tmp.data);
-               tmp.data = NULL;
 
                if (ret < 0) {
                        gnutls_assert();
@@ -842,9 +840,7 @@ static int verify_hash_attr(gnutls_pkcs7_t pkcs7, const char *root,
                }
 
                gnutls_free(tmp.data);
-               tmp.data = NULL;
                gnutls_free(tmp2.data);
-               tmp2.data = NULL;
        }
 
        if (msg_digest_ok)
@@ -1087,7 +1083,6 @@ static gnutls_x509_crt_t find_verified_issuer_of(gnutls_pkcs7_t pkcs7,
                        gnutls_x509_crt_deinit(issuer);
                        issuer = NULL;
                        gnutls_free(tmp.data);
-                       tmp.data = NULL;
                        continue;
                }
 
@@ -1204,7 +1199,6 @@ static gnutls_x509_crt_t find_child_of_with_serial(gnutls_pkcs7_t pkcs7,
                                gnutls_x509_crt_deinit(crt);
                                crt = NULL;
                                gnutls_free(tmpdata.data);
-                               tmpdata.data = NULL;
                                continue;
                        }
                } else {

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 049d2fb7ed3ee2e992443fa803da3d22449a2761..d0cb226364ddd7b5ca9ad4c83c166a74d9d1d660 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -601,7 +601,6 @@ gnutls_pkcs8_info(const gnutls_datum_t * data, gnutls_x509_crt_fmt_t format,
  cleanup:
        if (ret != GNUTLS_E_UNKNOWN_CIPHER_TYPE && oid) {
                gnutls_free(*oid);
-               *oid = NULL;
        }
        if (need_free)
                _gnutls_free_datum(&_data);

diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
index f4a580bb056bbff40af8ef17328b4a0374b248dd..07ef8f1fa6e1d072b26ea4fa7c3cb5df0408fd11 100644 (file)
--- a/lib/x509/verify-high2.c
+++ b/lib/x509/verify-high2.c
@@ -180,7 +180,6 @@ int remove_pkcs11_url(gnutls_x509_trust_list_t list, const char *ca_file)
 {
        if (strcmp(ca_file, list->pkcs11_token) == 0) {
                gnutls_free(list->pkcs11_token);
-               list->pkcs11_token = NULL;
        }
        return 0;
 }

diff --git a/lib/x509/virt-san.c b/lib/x509/virt-san.c
index f3b87135b181b1c28669af22c44c0c695c278969..a81337e25b302b3785b3ca4a9e2783cbced8987d 100644 (file)
--- a/lib/x509/virt-san.c
+++ b/lib/x509/virt-san.c
@@ -70,7 +70,6 @@ int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type, gnutl
                if (ret < 0)
                        return gnutls_assert_val(ret);
                gnutls_free(san->data);
-               san->data = NULL;
 
                if (othername_oid) {
                        name->othername_oid.data = (uint8_t *) othername_oid;

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 88aab5538e9d78724c8f51df1e54858b10d1ac1a..fa0188ef05d6fc0c72ee0e389e7f791c3d153f7e 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -386,7 +386,6 @@ static int cache_alt_names(gnutls_x509_crt_t cert)
        if (ret >= 0) {
                ret = gnutls_x509_ext_import_subject_alt_names(&tmpder, cert->san, 0);
                gnutls_free(tmpder.data);
-               tmpder.data = NULL;
                if (ret < 0)
                        return gnutls_assert_val(ret);
        }
@@ -3684,7 +3683,6 @@ gnutls_x509_crt_list_import2(gnutls_x509_crt_t ** certs,
 
        if (ret < 0) {
                gnutls_free(*certs);
-               *certs = NULL;
                return ret;
        }
 
@@ -4316,7 +4314,6 @@ gnutls_x509_crt_list_import_url(gnutls_x509_crt_t **certs,
 
                if (gnutls_x509_crt_equals2(crts[i-1], &issuer)) {
                        gnutls_free(issuer.data);
-                       issuer.data = NULL;
                        break;
                }
 
@@ -4337,7 +4334,6 @@ gnutls_x509_crt_list_import_url(gnutls_x509_crt_t **certs,
                }
 
                gnutls_free(issuer.data);
-               issuer.data = NULL;
        }
 
        *certs = gnutls_malloc(total*sizeof(gnutls_x509_crt_t));

diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index ffc05bc0a333818463d2bb705b1f9305eaa274cb..8a0acd30aa7e84896c9eb85f1ce3e2fe085ea1cd 100644 (file)
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -1994,7 +1994,6 @@ int gnutls_x509_ext_import_policies(const gnutls_datum_t * ext,
                                ret =
                                    decode_user_notice(td.data, td.size, &txt);
                                gnutls_free(td.data);
-                               td.data = NULL;
 
                                if (ret < 0) {
                                        gnutls_assert();

diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 9a1037405b1acc7e6848c44d4554afda10d5bbeb..3117843be17d2a75e97c10a4104ad8cd07e255ba 100644 (file)
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -302,7 +302,6 @@ _gnutls_base64_decode(const uint8_t * data, size_t data_size,
 
  fail:
        gnutls_free(result->data);
-       result->data = NULL;
 
  cleanup:
        gnutls_free(pdata.data);

diff --git a/tests/cert.c b/tests/cert.c
index da0ab23df4f75537f87c17ade3add95f5b573a15..ec566a4a4ae4a24ac566de4b23e30de91311a033 100644 (file)
--- a/tests/cert.c
+++ b/tests/cert.c
@@ -89,7 +89,6 @@ static int getnextcert(DIR **dirp, gnutls_datum_t *der, int *exp_ret)
                                *exp_ret = atoi((char*)local.data);
                                success("expecting error code %d\n", *exp_ret);
                                gnutls_free(local.data);
-                               local.data = NULL;
                        }
 
                        return 0;
@@ -135,7 +134,6 @@ void doit(void)
 
                gnutls_x509_crt_deinit(cert);
                gnutls_free(der.data);
-               der.data = NULL;
                der.size = 0;
                exp_ret = -1;
        }

diff --git a/tests/gnutls_session_set_id.c b/tests/gnutls_session_set_id.c
index 8de45892fb24d01941e87b16ac10663ac3822faa..e0e167ed27ca2225ffdcb3919068b42572aec2d7 100644 (file)
--- a/tests/gnutls_session_set_id.c
+++ b/tests/gnutls_session_set_id.c
@@ -200,7 +200,6 @@ static void start(const char *test, unsigned try_resume)
        gnutls_certificate_free_credentials(clientx509cred);
 
        gnutls_free(dbdata.data);
-       dbdata.data = NULL;
        dbdata.size = 0;
 }
 

diff --git a/tests/name-constraints-ip.c b/tests/name-constraints-ip.c
index 3dd4ff2cb2315579cfac459471505dc9aacbc342..ed96109c7ad23f746553799b03b1dfab2e931715 100644 (file)
--- a/tests/name-constraints-ip.c
+++ b/tests/name-constraints-ip.c
@@ -78,7 +78,6 @@ static void check_test_result(int ret, int expected_outcome,
 static void parse_cidr(const char* cidr, gnutls_datum_t *datum) {
        if (datum->data != NULL) {
                gnutls_free(datum->data);
-               datum->data = NULL;
        }
        int ret = gnutls_x509_cidr_to_rfc5280(cidr, datum);
        check_for_error(ret);
@@ -699,7 +698,7 @@ static int teardown(void **state) {
        gnutls_free(test_vars->ip.data);
        gnutls_x509_name_constraints_deinit(test_vars->nc);
        gnutls_x509_name_constraints_deinit(test_vars->nc2);
-       gnutls_free(test_vars);
+       gnutls_free(*state);
        return 0;
 }
 

diff --git a/tests/pkcs11/pkcs11-import-url-privkey.c b/tests/pkcs11/pkcs11-import-url-privkey.c
index 38d40b666ded0db73efb2c6bda756cb1199480c9..ded8c9a75e9bb83ace24a0262bed81ce003f28cf 100644 (file)
--- a/tests/pkcs11/pkcs11-import-url-privkey.c
+++ b/tests/pkcs11/pkcs11-import-url-privkey.c
@@ -91,7 +91,6 @@ void doit(void)
        for (i=0;i<obj_list_size;i++)
                gnutls_pkcs11_obj_deinit(obj_list[i]);
        gnutls_free(obj_list);
-       obj_list = NULL;
        obj_list_size = 0;
 
 #ifndef _WIN32
@@ -122,7 +121,6 @@ void doit(void)
                for (i=0;i<obj_list_size;i++)
                        gnutls_pkcs11_obj_deinit(obj_list[i]);
                gnutls_free(obj_list);
-               obj_list = NULL;
                obj_list_size = 0;
        }
 #endif

diff --git a/tests/pkcs11/pkcs11-privkey-always-auth.c b/tests/pkcs11/pkcs11-privkey-always-auth.c
index 3561c412fd4d8c9eecc4b34c6dd01280fa9c30d3..441f6372252059d3be0c7d2d7a89cb0cc0c175e7 100644 (file)
--- a/tests/pkcs11/pkcs11-privkey-always-auth.c
+++ b/tests/pkcs11/pkcs11-privkey-always-auth.c
@@ -175,7 +175,6 @@ void doit(void)
        pin_called = 0;
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        /* call again - should re-authenticate */
        ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig);
@@ -190,7 +189,6 @@ void doit(void)
        pin_called = 0;
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        if (debug)
                printf("done\n\n\n");

diff --git a/tests/pkcs11/pkcs11-privkey-fork-reinit.c b/tests/pkcs11/pkcs11-privkey-fork-reinit.c
index 1535d644f93f4afc687be802367c79dd6eca9f6f..a72584225731de18c8730f6d0241c9cf7cef3deb 100644 (file)
--- a/tests/pkcs11/pkcs11-privkey-fork-reinit.c
+++ b/tests/pkcs11/pkcs11-privkey-fork-reinit.c
@@ -123,7 +123,6 @@ void doit(void)
        }
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        pid = fork();
        if (pid != 0) {

diff --git a/tests/pkcs11/pkcs11-privkey-fork.c b/tests/pkcs11/pkcs11-privkey-fork.c
index 9d301d7d62b6476002cf56aa39e893042cb0bd4f..b99755c73bfc9b0970c6c306e9e9d3a83f2e5fc2 100644 (file)
--- a/tests/pkcs11/pkcs11-privkey-fork.c
+++ b/tests/pkcs11/pkcs11-privkey-fork.c
@@ -123,7 +123,6 @@ void doit(void)
        }
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        pid = fork();
        if (pid != 0) {

diff --git a/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c b/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c
index 1b5b34054d4f1d871238173da36790f7abc02db4..a4ab5b5aa35186cfac27a8451b79b25361ca20bf 100644 (file)
--- a/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c
+++ b/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c
@@ -157,7 +157,6 @@ void doit(void)
        pin_called = 0;
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        /* call again - should re-authenticate */
        ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig);
@@ -172,7 +171,6 @@ void doit(void)
        pin_called = 0;
 
        gnutls_free(sig.data);
-       sig.data = NULL;
 
        if (debug)
                printf("done\n\n\n");

diff --git a/tests/pkcs7.c b/tests/pkcs7.c
index a490976fc55db2b146be5253f76718ba6987efba..2d5a5548d48acce070e138f8a82b2f5789e91882 100644 (file)
--- a/tests/pkcs7.c
+++ b/tests/pkcs7.c
@@ -90,7 +90,6 @@ static int getnextfile(DIR **dirp, gnutls_datum_t *der, int *exp_ret)
                                *exp_ret = atoi((char*)local.data);
                                success("expecting error code %d\n", *exp_ret);
                                gnutls_free(local.data);
-                               local.data = NULL;
                        }
 
                        return 0;
@@ -134,7 +133,6 @@ void doit(void)
 
                gnutls_pkcs7_deinit(cert);
                gnutls_free(der.data);
-               der.data = NULL;
                der.size = 0;
                exp_ret = -1;
        }

diff --git a/tests/resume-dtls.c b/tests/resume-dtls.c
index 9e6327c7fe5a66049cf68dc4e9ebe7eebacef544..b5b214313a6bcf76006096484fc872b2ebe9a3ff 100644 (file)
--- a/tests/resume-dtls.c
+++ b/tests/resume-dtls.c
@@ -363,7 +363,6 @@ static void server(int sds[], struct params_res *params)
        }
 
        gnutls_free(session_ticket_key.data);
-       session_ticket_key.data = NULL;
        gnutls_anon_free_server_credentials(anoncred);
 
        if (debug)

diff --git a/tests/resume.c b/tests/resume.c
index 0a3b20eac88c7fcacbabb0a8173b6f47c195c28a..381f32da6a9c8b812440dbbec5c625ddfab9d74a 100644 (file)
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -900,7 +900,6 @@ static void server(int sds[], struct params_res *params)
        }
 
        gnutls_free(session_ticket_key.data);
-       session_ticket_key.data = NULL;
 
        if (debug)
                success("server: finished\n");

diff --git a/tests/sign-verify-data.c b/tests/sign-verify-data.c
index 3aa261175500fd84cf32257ddb4d12c68f7fb1e3..558ad22530fef448adbaced06ac3db0b23dc9e84 100644 (file)
--- a/tests/sign-verify-data.c
+++ b/tests/sign-verify-data.c
@@ -153,7 +153,6 @@ void doit(void)
 
                /* test the raw interface */
                gnutls_free(signature.data);
-               signature.data = NULL;
 
                gnutls_free(signature.data);
                gnutls_x509_crt_deinit(crt);

diff --git a/tests/sign-verify-ext.c b/tests/sign-verify-ext.c
index eecb1f357b86c31047dc326c8127bdafae8c5bda..cc80bf907f81d11676d19e59aa2f8445f22923eb 100644 (file)
--- a/tests/sign-verify-ext.c
+++ b/tests/sign-verify-ext.c
@@ -186,9 +186,7 @@ void doit(void)
 
                /* test the raw interface */
                gnutls_free(signature.data);
-               signature.data = NULL;
                gnutls_free(signature2.data);
-               signature2.data = NULL;
 
                if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) ==
                    GNUTLS_PK_RSA) {

diff --git a/tests/sign-verify-ext4.c b/tests/sign-verify-ext4.c
index 81aa345bf09fcfea25daf171e4d205040e070a88..be582ec1488a373d32b89e640456926560a06356 100644 (file)
--- a/tests/sign-verify-ext4.c
+++ b/tests/sign-verify-ext4.c
@@ -227,7 +227,6 @@ void doit(void)
                        testfail("gnutls_pubkey_verify_data2\n");
 
                gnutls_free(signature.data);
-               signature.data = NULL;
 
 
                if (!tests[i].data_only) {
@@ -243,7 +242,6 @@ void doit(void)
                                testfail("gnutls_pubkey_verify_hash2-1 (hashed data)\n");
 
                        gnutls_free(signature2.data);
-                       signature2.data = NULL;
                }
 
                if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) ==

diff --git a/tests/sign-verify.c b/tests/sign-verify.c
index 1fbed5ece22be099229a2e72b815f32b26986892..5a14741fc64f38889c0665ca397d298074d1f059 100644 (file)
--- a/tests/sign-verify.c
+++ b/tests/sign-verify.c
@@ -206,7 +206,6 @@ void doit(void)
 
                /* test the raw interface */
                gnutls_free(signature.data);
-               signature.data = NULL;
 
                if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) ==
                    GNUTLS_PK_RSA) {

diff --git a/tests/x509-extensions.c b/tests/x509-extensions.c
index d480f836462f40c50678ccb59ea26b2db835d029..a062c1ba8a21c6d6a5f5f3cdaad87870157b3919 100644 (file)
--- a/tests/x509-extensions.c
+++ b/tests/x509-extensions.c
@@ -767,7 +767,6 @@ void doit(void)
                        }
                }
                gnutls_free(ext.data);
-               ext.data = NULL;
        }
 
        if (debug)

diff --git a/tests/x509sign-verify-error.c b/tests/x509sign-verify-error.c
index 54bdc40abe028e53d3c9b0513d1c3eda836c1993..97c96668592a1be61614a1cdd981f523866c6804 100644 (file)
--- a/tests/x509sign-verify-error.c
+++ b/tests/x509sign-verify-error.c
@@ -181,7 +181,6 @@ void doit(void)
                        fail("gnutls_privkey_sign_hash\n");
 
                gnutls_free(signature2.data);
-               signature2.data = NULL;
 
                _gnutls_lib_simulate_error();
                ret = gnutls_privkey_sign_hash(privkey, GNUTLS_DIG_SHA1, 0,