aboutsummaryrefslogtreecommitdiff
path: root/openssl/trunk/ssl/s2_clnt.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/trunk/ssl/s2_clnt.c')
-rw-r--r--openssl/trunk/ssl/s2_clnt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/trunk/ssl/s2_clnt.c b/openssl/trunk/ssl/s2_clnt.c
index efb52485..ce60de63 100644
--- a/openssl/trunk/ssl/s2_clnt.c
+++ b/openssl/trunk/ssl/s2_clnt.c
@@ -520,7 +520,8 @@ static int get_server_hello(SSL *s)
CRYPTO_add(&s->session->peer->references, 1, CRYPTO_LOCK_X509);
}
- if (s->session->peer != s->session->sess_cert->peer_key->x509)
+ if (s->session->sess_cert == NULL
+ || s->session->peer != s->session->sess_cert->peer_key->x509)
/* can't happen */
{
ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);