summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxkernel <xkernel.wang@foxmail.com>2022-03-08 19:48:54 +0800
committerMatt Caswell <matt@openssl.org>2022-03-10 14:30:09 +0000
commit8796b8f850b34c01182638141116e8e14654d979 (patch)
tree22f851d1c1edd517ae71c3de4154a78a2866ef9f
parent005bb591a01a7434cbc05378c35ef3746ce0b82d (diff)
check the return of OPENSSL_sk_new_null
Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Patrick Steuer <patrick.steuer@de.ibm.com> (Merged from https://github.com/openssl/openssl/pull/17836) (cherry picked from commit 5266af87379aecb0ae6036dee88c1a0b8083a432)
-rw-r--r--crypto/encode_decode/encoder_pkey.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index 109dfa80cd..b0564d5500 100644
--- a/crypto/encode_decode/encoder_pkey.c
+++ b/crypto/encode_decode/encoder_pkey.c
@@ -254,6 +254,11 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
* First, collect the keymgmt names, then the encoders that match.
*/
keymgmt_data.names = sk_OPENSSL_CSTRING_new_null();
+ if (keymgmt_data.names == NULL) {
+ ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_MALLOC_FAILURE);
+ goto err;
+ }
+
keymgmt_data.error_occurred = 0;
EVP_KEYMGMT_names_do_all(pkey->keymgmt, collect_name, &keymgmt_data);
if (keymgmt_data.error_occurred) {