diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-08-25 13:25:58 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-02 22:05:37 -0400 |
| commit | b51bce942023325e727ca4225252d06c49d8f2b7 (patch) | |
| tree | 59bbdee7553f9132a86aca17752a9a358a6355e2 /crypto/x509/x509_vpm.c | |
| parent | 66e87a9f0990198079bf4d2b3ce87581ad5b6b10 (diff) | |
Add and use OPENSSL_zalloc
There are many places (nearly 50) where we malloc and then memset.
Add an OPENSSL_zalloc routine to encapsulate that.
(Missed one conversion; thanks Richard)
Also fixes GH328
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/x509/x509_vpm.c')
| -rw-r--r-- | crypto/x509/x509_vpm.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index eedc2179a6..cf8784d5fb 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -162,24 +162,14 @@ X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void) X509_VERIFY_PARAM *param; X509_VERIFY_PARAM_ID *paramid; - param = OPENSSL_malloc(sizeof(*param)); + param = OPENSSL_zalloc(sizeof(*param)); if (!param) return NULL; - memset(param, 0, sizeof(*param)); - - paramid = OPENSSL_malloc(sizeof(*paramid)); + param->id = paramid = OPENSSL_zalloc(sizeof(*paramid)); if (!paramid) { OPENSSL_free(param); return NULL; } - memset(paramid, 0, sizeof(*paramid)); - /* Exotic platforms may have non-zero bit representation of NULL */ - paramid->hosts = NULL; - paramid->peername = NULL; - paramid->email = NULL; - paramid->ip = NULL; - - param->id = paramid; x509_verify_param_zero(param); return param; } |