提交 fefe3169 编写于 作者: J jayaram 提交者: Patrick Steuer

fix for Missing null check after OPENSSL_zalloc

Fixes #10283
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NPatrick Steuer <patrick.steuer@de.ibm.com>
(Merged from https://github.com/openssl/openssl/pull/10296)
上级 351ba5bd
...@@ -18,12 +18,14 @@ static OSSL_PARAM *paramdefs_to_params(const OSSL_PARAM *paramdefs) ...@@ -18,12 +18,14 @@ static OSSL_PARAM *paramdefs_to_params(const OSSL_PARAM *paramdefs)
{ {
size_t cnt; size_t cnt;
const OSSL_PARAM *p; const OSSL_PARAM *p;
OSSL_PARAM *params, *q; OSSL_PARAM *params = NULL, *q;
for (cnt = 1, p = paramdefs; p->key != NULL; p++, cnt++) for (cnt = 1, p = paramdefs; p->key != NULL; p++, cnt++)
continue; continue;
params = OPENSSL_zalloc(cnt * sizeof(*params)); params = OPENSSL_zalloc(cnt * sizeof(*params));
if (params == NULL)
return NULL;
for (p = paramdefs, q = params; ; p++, q++) { for (p = paramdefs, q = params; ; p++, q++) {
*q = *p; *q = *p;
...@@ -78,6 +80,8 @@ static void *allocate_params_space(OSSL_PARAM *params) ...@@ -78,6 +80,8 @@ static void *allocate_params_space(OSSL_PARAM *params)
return NULL; return NULL;
data = OPENSSL_zalloc(space); data = OPENSSL_zalloc(space);
if (data == NULL)
return NULL;
for (space = 0, p = params; p->key != NULL; p++) { for (space = 0, p = params; p->key != NULL; p++) {
p->data = data + space; p->data = data + space;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册