diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-02-13 19:01:14 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-05-23 13:42:37 +0100 |
| commit | a98810bfac37a77750592611bb9f5a22e4634692 (patch) | |
| tree | babddb6ee6ef2cc310e467063b6ca312bfa2f499 | |
| parent | 11ed851db0c49f9fdd534fbd8a2791266f32c5b8 (diff) | |
| download | openssl-a98810bfac37a77750592611bb9f5a22e4634692.tar.gz | |
Fix some malloc failure crashes on X509_STORE_CTX_set_ex_data
from BoringSSL 306ece31bcaaed49e0240a2e5555f8901ebb2d45
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | ssl/ssl_cert.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index f285fbe882..7481705ed0 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -409,7 +409,9 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) /* Set suite B flags if needed */ X509_STORE_CTX_set_flags(ctx, tls1_suiteb(s)); - X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s); + if (!X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s)) { + goto end; + } /* Verify via DANE if enabled */ if (DANETLS_ENABLED(&s->dane)) |