[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  cae665dfa6ccec743a7f39cf80676d7d2d787e56 (commit)
      from  bcc0025d0b5d231ee3662cf7f3c522ba43079858 (commit)


- Log -----------------------------------------------------------------
commit cae665dfa6ccec743a7f39cf80676d7d2d787e56
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Aug 16 15:18:51 2019 +0200

    Fix error handling in X509_chain_up_ref
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9614)

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

Summary of changes:
 crypto/x509/x509_cmp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 284ca5452c..d7bbbc1947 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -450,9 +450,17 @@ STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain)
     STACK_OF(X509) *ret;
     int i;
     ret = sk_X509_dup(chain);
+    if (ret == NULL)
+        return NULL;
     for (i = 0; i < sk_X509_num(ret); i++) {
         X509 *x = sk_X509_value(ret, i);
-        X509_up_ref(x);
+        if (!X509_up_ref(x))
+            goto err;
     }
     return ret;
+ err:
+    while (i-- > 0)
+        X509_free (sk_X509_value(ret, i));
+    sk_X509_free(ret);
+    return NULL;
 }