diff options
| author | Rich Salz <rsalz@openssl.org> | 2018-04-03 11:31:16 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-04-03 11:31:16 -0400 |
| commit | cdb10bae3f773401e039c55965eb177a6f3fc160 (patch) | |
| tree | c69b1b2bc385d3f600684cf8285b9ff80322c48f /crypto/conf | |
| parent | 29f484d00d732ea4c19a7fd3dc0440045653e79e (diff) | |
Set error code on alloc failures
Almost all *alloc failures now set an error code.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5842)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_err.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_mod.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c index dd20a1aafa..ebef728456 100644 --- a/crypto/conf/conf_err.c +++ b/crypto/conf/conf_err.c @@ -21,6 +21,7 @@ static const ERR_STRING_DATA CONF_str_functs[] = { {ERR_PACK(ERR_LIB_CONF, CONF_F_DEF_LOAD, 0), "def_load"}, {ERR_PACK(ERR_LIB_CONF, CONF_F_DEF_LOAD_BIO, 0), "def_load_bio"}, {ERR_PACK(ERR_LIB_CONF, CONF_F_GET_NEXT_FILE, 0), "get_next_file"}, + {ERR_PACK(ERR_LIB_CONF, CONF_F_MODULE_ADD, 0), "module_add"}, {ERR_PACK(ERR_LIB_CONF, CONF_F_MODULE_INIT, 0), "module_init"}, {ERR_PACK(ERR_LIB_CONF, CONF_F_MODULE_LOAD_DSO, 0), "module_load_dso"}, {ERR_PACK(ERR_LIB_CONF, CONF_F_MODULE_RUN, 0), "module_run"}, diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 7622d8e1f3..99f0fcc2b5 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -232,9 +232,10 @@ static CONF_MODULE *module_add(DSO *dso, const char *name, supported_modules = sk_CONF_MODULE_new_null(); if (supported_modules == NULL) return NULL; - tmod = OPENSSL_zalloc(sizeof(*tmod)); - if (tmod == NULL) + if ((tmod = OPENSSL_zalloc(sizeof(*tmod))) == NULL) { + CONFerr(CONF_F_MODULE_ADD, ERR_R_MALLOC_FAILURE); return NULL; + } tmod->dso = dso; tmod->name = OPENSSL_strdup(name); |