From ae0ce0220b48c9c13ba862895db6bca27d6446db Mon Sep 17 00:00:00 2001 From: tedu <> Date: Thu, 29 May 2014 16:42:04 +0000 Subject: use calloc, from Benjamin Baier --- src/lib/libcrypto/store/str_lib.c | 6 +----- src/lib/libssl/src/crypto/store/str_lib.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c index f9beab2952..c50620308a 100644 --- a/src/lib/libcrypto/store/str_lib.c +++ b/src/lib/libcrypto/store/str_lib.c @@ -1174,11 +1174,7 @@ STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[], STORE_OBJECT * STORE_OBJECT_new(void) { - STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); - - if (object) - memset(object, 0, sizeof(STORE_OBJECT)); - return object; + return calloc(1, sizeof(STORE_OBJECT)); } void diff --git a/src/lib/libssl/src/crypto/store/str_lib.c b/src/lib/libssl/src/crypto/store/str_lib.c index f9beab2952..c50620308a 100644 --- a/src/lib/libssl/src/crypto/store/str_lib.c +++ b/src/lib/libssl/src/crypto/store/str_lib.c @@ -1174,11 +1174,7 @@ STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[], STORE_OBJECT * STORE_OBJECT_new(void) { - STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); - - if (object) - memset(object, 0, sizeof(STORE_OBJECT)); - return object; + return calloc(1, sizeof(STORE_OBJECT)); } void -- cgit v1.2.3-55-g6feb