[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1d8b4eb2b478651f820423789d7a91b9b4c2d009 (commit)
      from  5388b8d4e8faac21921843c63b12b71c0ab9153e (commit)


- Log -----------------------------------------------------------------
commit 1d8b4eb2b478651f820423789d7a91b9b4c2d009
Author: mmiyashita <mmiyashita at users.noreply.github.com>
Date:   Tue Jun 21 11:01:30 2016 -0700

    segmentation fault with 'openssl s_client -prexit -keymatexport'
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1243)

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

Summary of changes:
 apps/s_client.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 41fed85..56a7081 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);