From cdb10bae3f773401e039c55965eb177a6f3fc160 Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@openssl.org>
Date: Tue, 3 Apr 2018 11:31:16 -0400
Subject: Set error code on alloc failures

Almost all *alloc failures now set an error code.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5842)
---
 crypto/cms/cms_enc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'crypto/cms/cms_enc.c')

diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index ed913426bc..853e2f1291 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -168,9 +168,10 @@ int cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
 {
     ec->cipher = cipher;
     if (key) {
-        ec->key = OPENSSL_malloc(keylen);
-        if (ec->key == NULL)
+        if ((ec->key = OPENSSL_malloc(keylen)) == NULL) {
+            CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT, ERR_R_MALLOC_FAILURE);
             return 0;
+        }
         memcpy(ec->key, key, keylen);
     }
     ec->keylen = keylen;
-- 
cgit v1.2.3