[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  fbaf2857cc9ea8324b3f19dc79d32a6c1ad31696 (commit)
      from  a020f54c25985fc83e809daa15a3920731d39612 (commit)


- Log -----------------------------------------------------------------
commit fbaf2857cc9ea8324b3f19dc79d32a6c1ad31696
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Jun 11 13:44:56 2017 -0400

    If-guard to avoid null ptr deref in statem_srvr.c
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    CLA: trivial
    (Merged from https://github.com/openssl/openssl/pull/3419)

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

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

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index c26c93b..e2d618c 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1444,7 +1444,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt)
  err:
     ossl_statem_set_error(s);
 
-    OPENSSL_free(clienthello->pre_proc_exts);
+    if (clienthello != NULL)
+        OPENSSL_free(clienthello->pre_proc_exts);
     OPENSSL_free(clienthello);
 
     return MSG_PROCESS_ERROR;