diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-08-16 15:18:51 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-08-17 16:49:46 +0200 |
| commit | cae665dfa6ccec743a7f39cf80676d7d2d787e56 (patch) | |
| tree | f2fbb722769b2395243ea840e49aaf178d38f6b1 /crypto | |
| parent | bcc0025d0b5d231ee3662cf7f3c522ba43079858 (diff) | |
Fix error handling in X509_chain_up_ref
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9614)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/x509/x509_cmp.c | 10 |
1 files changed, 9 insertions, 1 deletions
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; } |