diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-30 11:12:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 22:48:41 +0000 |
| commit | 90945fa31a42dcf3beb90540c618e4d627c595ea (patch) | |
| tree | e73870c253abf0c37ca618384e30a7937a996b55 /crypto/engine/eng_dyn.c | |
| parent | a71edf3ba275b946224b5bcded0a8ecfce1855c0 (diff) | |
| download | openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.zip openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.tar.gz openssl-90945fa31a42dcf3beb90540c618e4d627c595ea.tar.bz2 | |
Continue standardising malloc style for libcrypto
Continuing from previous commit ensure our style is consistent for malloc
return checks.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/engine/eng_dyn.c')
| -rw-r--r-- | crypto/engine/eng_dyn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 100b050..aed50f6 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -204,12 +204,12 @@ static int dynamic_set_data_ctx(ENGINE *e, dynamic_data_ctx **ctx) { dynamic_data_ctx *c = OPENSSL_zalloc(sizeof(*c)); - if (!c) { + if (c == NULL) { ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX, ERR_R_MALLOC_FAILURE); return 0; } c->dirs = sk_OPENSSL_STRING_new_null(); - if (!c->dirs) { + if (c->dirs == NULL) { ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX, ERR_R_MALLOC_FAILURE); OPENSSL_free(c); return 0; @@ -278,7 +278,7 @@ static dynamic_data_ctx *dynamic_get_data_ctx(ENGINE *e) static ENGINE *engine_dynamic(void) { ENGINE *ret = ENGINE_new(); - if (!ret) + if (ret == NULL) return NULL; if (!ENGINE_set_id(ret, engine_dynamic_id) || !ENGINE_set_name(ret, engine_dynamic_name) || @@ -438,8 +438,10 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx) ENGINE cpy; dynamic_fns fns; - if (!ctx->dynamic_dso) + if (ctx->dynamic_dso == NULL) ctx->dynamic_dso = DSO_new(); + if (ctx->dynamic_dso == NULL) + return 0; if (!ctx->DYNAMIC_LIBNAME) { if (!ctx->engine_id) return 0; |