diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
| commit | b548a1f11c06ccdfa4f52a539912d22d77ee309e (patch) | |
| tree | 37ff8792ddf09e4805aa3ba76b805923d3c52734 /crypto/x509/x509_vpm.c | |
| parent | 33fbca83dcd05b77f807fab205c4523b8cfe85b5 (diff) | |
| download | openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.zip openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.tar.gz openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.tar.bz2 | |
free null cleanup finale
Don't check for NULL before calling OPENSSL_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/x509/x509_vpm.c')
| -rw-r--r-- | crypto/x509/x509_vpm.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 57c2606..b0d9c4d 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -149,19 +149,13 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param) paramid = param->id; string_stack_free(paramid->hosts); paramid->hosts = NULL; - if (paramid->peername) - OPENSSL_free(paramid->peername); - if (paramid->email) { - OPENSSL_free(paramid->email); - paramid->email = NULL; - paramid->emaillen = 0; - } - if (paramid->ip) { - OPENSSL_free(paramid->ip); - paramid->ip = NULL; - paramid->iplen = 0; - } - + OPENSSL_free(paramid->peername); + OPENSSL_free(paramid->email); + paramid->email = NULL; + paramid->emaillen = 0; + OPENSSL_free(paramid->ip); + paramid->ip = NULL; + paramid->iplen = 0; } X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void) @@ -346,8 +340,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, tmp = NULL; srclen = 0; } - if (*pdest) - OPENSSL_free(*pdest); + OPENSSL_free(*pdest); *pdest = tmp; if (pdestlen) *pdestlen = srclen; @@ -356,8 +349,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) { - if (param->name) - OPENSSL_free(param->name); + OPENSSL_free(param->name); param->name = BUF_strdup(name); if (param->name) return 1; |