diff options
| author | Daniel DeFreez <daniel@defreez.com> | 2019-02-07 09:55:14 -0800 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-02-11 08:30:46 +1000 |
| commit | 758229f7d22775d7547e3b3b886b7f6a289c6897 (patch) | |
| tree | bb6563bc9bfbe67f47506f56717883e0f91071c3 | |
| parent | 1980ce45d6bdd2b57df7003d6b56b5df560b9064 (diff) | |
| download | openssl-758229f7d22775d7547e3b3b886b7f6a289c6897.zip openssl-758229f7d22775d7547e3b3b886b7f6a289c6897.tar.gz openssl-758229f7d22775d7547e3b3b886b7f6a289c6897.tar.bz2 | |
Fix null pointer dereference in ssl_module_init
CLA: Trivial
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8183)
| -rw-r--r-- | crypto/conf/conf_ssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index a1b24b2..d703f73 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -78,6 +78,8 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) cnt = sk_CONF_VALUE_num(cmd_lists); ssl_module_free(md); ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt); + if (ssl_names == NULL) + goto err; ssl_names_count = cnt; for (i = 0; i < ssl_names_count; i++) { struct ssl_conf_name_st *ssl_name = ssl_names + i; |