X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fdso%2Fdso_lib.c;h=c555398fcae69c1118eaf08aefe572e82a157979;hp=a33a8a85bb2124aaa3946e1b774cd9b03c83757d;hb=16f8d4ebf0fd4847fa83d9c61f4150273cb4f533;hpb=b548a1f11c06ccdfa4f52a539912d22d77ee309e diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index a33a8a85bb..c555398fca 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c @@ -104,12 +104,12 @@ DSO *DSO_new_method(DSO_METHOD *meth) */ default_DSO_meth = DSO_METHOD_openssl(); } - ret = OPENSSL_malloc(sizeof(DSO)); + ret = OPENSSL_malloc(sizeof(*ret)); if (ret == NULL) { DSOerr(DSO_F_DSO_NEW_METHOD, ERR_R_MALLOC_FAILURE); return (NULL); } - memset(ret, 0, sizeof(DSO)); + memset(ret, 0, sizeof(*ret)); ret->meth_data = sk_void_new_null(); if (ret->meth_data == NULL) { /* sk_new doesn't generate any errors so we do */ @@ -133,10 +133,8 @@ int DSO_free(DSO *dso) { int i; - if (dso == NULL) { - DSOerr(DSO_F_DSO_FREE, ERR_R_PASSED_NULL_PARAMETER); - return (0); - } + if (dso == NULL) + return (1); i = CRYPTO_add(&dso->references, -1, CRYPTO_LOCK_DSO); #ifdef REF_PRINT