[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  1fa7e2ee06f24cdc7fe04599456a07f29db69d95 (commit)
      from  1ed9fafccc37bcc78c12d20d586842ee7c7cd8a6 (commit)


- Log -----------------------------------------------------------------
commit 1fa7e2ee06f24cdc7fe04599456a07f29db69d95
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 10 16:23:14 2018 +0100

    Check the return value from ASN1_INTEGER_set
    
    Found by Coverity
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7169)
    
    (cherry picked from commit 512d811719fc955f574090af4c3586a9aba46fa7)

-----------------------------------------------------------------------

Summary of changes:
 crypto/pkcs12/p12_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index a78e183..7b76909 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -22,7 +22,8 @@ PKCS12 *PKCS12_init(int mode)
         PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
         return NULL;
     }
-    ASN1_INTEGER_set(pkcs12->version, 3);
+    if (!ASN1_INTEGER_set(pkcs12->version, 3))
+        goto err;
     pkcs12->authsafes->type = OBJ_nid2obj(mode);
     switch (mode) {
     case NID_pkcs7_data: