From 3ed632757126473aebcb1dd486306eb7b62c341f Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Thu, 10 Jul 2014 17:47:48 +0100 Subject: [PATCH] Don't clean up uninitialised EVP_CIPHER_CTX on error (CID 483259). (cherry picked from commit c1d1b0114e9d370c30649e46182393dbfc00e20c) --- crypto/cms/cms_pwri.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index b79612a12d..71f2ddb496 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -93,9 +93,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms, X509_ALGOR *encalg = NULL; unsigned char iv[EVP_MAX_IV_LENGTH]; int ivlen; + env = cms_get0_enveloped(cms); if (!env) - goto err; + return NULL; if (wrap_nid <= 0) wrap_nid = NID_id_alg_PWRI_KEK; -- 2.34.1