diff options
author | tedu <> | 2014-05-29 16:42:04 +0000 |
---|---|---|
committer | tedu <> | 2014-05-29 16:42:04 +0000 |
commit | d91b3915cf96d42bf3ca583dbdeee285ea9ca608 (patch) | |
tree | 942006e51e4b2364b022f3dd07bf15eb33b2a549 | |
parent | 0a5975d055bee8398d6d64a3b24405f129531399 (diff) | |
download | openbsd-d91b3915cf96d42bf3ca583dbdeee285ea9ca608.tar.gz openbsd-d91b3915cf96d42bf3ca583dbdeee285ea9ca608.tar.bz2 openbsd-d91b3915cf96d42bf3ca583dbdeee285ea9ca608.zip |
use calloc, from Benjamin Baier
-rw-r--r-- | src/lib/libcrypto/store/str_lib.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/store/str_lib.c | 6 |
2 files changed, 2 insertions, 10 deletions
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[], | |||
1174 | STORE_OBJECT * | 1174 | STORE_OBJECT * |
1175 | STORE_OBJECT_new(void) | 1175 | STORE_OBJECT_new(void) |
1176 | { | 1176 | { |
1177 | STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); | 1177 | return calloc(1, sizeof(STORE_OBJECT)); |
1178 | |||
1179 | if (object) | ||
1180 | memset(object, 0, sizeof(STORE_OBJECT)); | ||
1181 | return object; | ||
1182 | } | 1178 | } |
1183 | 1179 | ||
1184 | void | 1180 | 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[], | |||
1174 | STORE_OBJECT * | 1174 | STORE_OBJECT * |
1175 | STORE_OBJECT_new(void) | 1175 | STORE_OBJECT_new(void) |
1176 | { | 1176 | { |
1177 | STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); | 1177 | return calloc(1, sizeof(STORE_OBJECT)); |
1178 | |||
1179 | if (object) | ||
1180 | memset(object, 0, sizeof(STORE_OBJECT)); | ||
1181 | return object; | ||
1182 | } | 1178 | } |
1183 | 1179 | ||
1184 | void | 1180 | void |