1 # This patch addresses multiple segmentation faults:

     2 # Pull Requests submitted to the upstream:

     3 #   https://github.com/openssl/openssl/pull/1243

     4 # Fixed by upstream:

     5 #   

     6 --- a/apps/s_client.c	Tue May  3 06:44:42 2016

     7 +++ b/apps/s_client.c	Wed May  4 15:11:00 2016

     8 @@ -2633,7 +2633,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)

     9  #endif

    10  

    11      SSL_SESSION_print(bio, SSL_get_session(s));

    12 -    if (keymatexportlabel != NULL) {

    13 +    if ((SSL_get_session(s) != NULL) &&

    14 +        (keymatexportlabel != NULL)) {

    15          BIO_printf(bio, "Keying material exporter:\n");

    16          BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);

    17          BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);