diff options
| author | mmiyashita <mmiyashita@users.noreply.github.com> | 2016-06-21 11:01:30 -0700 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-21 17:30:46 -0400 |
| commit | 1d8b4eb2b478651f820423789d7a91b9b4c2d009 (patch) | |
| tree | a28bdd4cae01b73f19caf1f3e14d76bbe27de349 | |
| parent | 5388b8d4e8faac21921843c63b12b71c0ab9153e (diff) | |
segmentation fault with 'openssl s_client -prexit -keymatexport'
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1243)
| -rw-r--r-- | apps/s_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 41fed85ea0..56a7081cab 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2633,7 +2633,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) #endif SSL_SESSION_print(bio, SSL_get_session(s)); - if (keymatexportlabel != NULL) { + if ((SSL_get_session(s) != NULL) && + (keymatexportlabel != NULL)) { BIO_printf(bio, "Keying material exporter:\n"); BIO_printf(bio, " Label: '%s'\n", keymatexportlabel); BIO_printf(bio, " Length: %i bytes\n", keymatexportlen); |