[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  312e9387fddacbcef4148bd3ace25c7db89e374e (commit)
      from  d08086645f72ab890c6ef996bb513076752431f0 (commit)


- Log -----------------------------------------------------------------
commit 312e9387fddacbcef4148bd3ace25c7db89e374e
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Mar 4 15:45:40 2017 +0000

    Fix a memory leak on an error path
    
    A leak of an SSL_SESSION object can occur when decoding a psk extension on
    an error path when using TLSv1.3
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2843)

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

Summary of changes:
 ssl/statem/extensions_srvr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index 83fb713..ab3ad46 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -796,6 +796,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
     s->session = sess;
     return 1;
 err:
+    SSL_SESSION_free(sess);
     return 0;
 }