generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RT3754: check for NULL pointer

Browse Source 
Fix both the caller to error out on malloc failure, as well as the
eventual callee to handle a NULL gracefully.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Emilia Kasper 2015-09-01 16:31:55 +02:00
parent dd642deea8
commit 4cb23e12a3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/p_lib.c
View File

@ -253,7 +253,7 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
{ {
if (!EVP_PKEY_set_type(pkey, type)) if (pkey == NULL || !EVP_PKEY_set_type(pkey, type))
return 0; return 0;
pkey->pkey.ptr = key; pkey->pkey.ptr = key;
return (key != NULL); return (key != NULL);

9
crypto/evp/pmeth_gn.c
View File

@ -96,12 +96,17 @@ int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
return -1; return -1;
} }
if (!ppkey) if (ppkey == NULL)
return -1; return -1;
if (!*ppkey) if (*ppkey == NULL)
*ppkey = EVP_PKEY_new(); *ppkey = EVP_PKEY_new();
if (*ppkey == NULL) {
EVPerr(EVP_F_EVP_PKEY_PARAMGEN, ERR_R_MALLOC_FAILURE);
return -1;
}
ret = ctx->pmeth->paramgen(ctx, *ppkey); ret = ctx->pmeth->paramgen(ctx, *ppkey);
if (ret <= 0) { if (ret <= 0) {
EVP_PKEY_free(*ppkey); EVP_PKEY_free(*ppkey);