summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-04-23 21:49:50 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-04-23 21:49:50 +0000
commite0e2c6f4ddefb8ee2392ded884ca3f3cc9a8849d (patch)
tree05861be83d2452c56f27bec28899b01fd41fd7cf
parent522757cf6d0f66f1cef83905c38420e6a80fd880 (diff)
malloc/memset -> calloc. from peter malone
-rw-r--r--lib/libssl/src/crypto/dso/dso_lib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/dso/dso_lib.c b/lib/libssl/src/crypto/dso/dso_lib.c
index 1ee4e45dce4..ae10104560e 100644
--- a/lib/libssl/src/crypto/dso/dso_lib.c
+++ b/lib/libssl/src/crypto/dso/dso_lib.c
@@ -107,12 +107,11 @@ DSO_new_method(DSO_METHOD *meth)
* to stealing the "best available" method. Will fallback
* to DSO_METH_null() in the worst case. */
default_DSO_meth = DSO_METHOD_openssl();
- ret = (DSO *)malloc(sizeof(DSO));
+ ret = calloc(1, sizeof(DSO));
if (ret == NULL) {
DSOerr(DSO_F_DSO_NEW_METHOD, ERR_R_MALLOC_FAILURE);
return (NULL);
}
- memset(ret, 0, sizeof(DSO));
ret->meth_data = sk_void_new_null();
if (ret->meth_data == NULL) {
/* sk_new doesn't generate any errors so we do */