[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  febb0afaef47ed74b2bdbde0b4278263390f4185 (commit)
      from  6556519ea0581323f2330684ad2ae81f0448ef52 (commit)


- Log -----------------------------------------------------------------
commit febb0afaef47ed74b2bdbde0b4278263390f4185
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Mar 5 21:00:11 2017 +0100

    Fix double free in cookie generation.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    GH: #2850

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

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

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 23dc8d3..8860462 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -658,6 +658,7 @@ int tls_construct_ctos_cookie(SSL *s, WPACKET *pkt, unsigned int context,
     ret = 1;
  end:
     OPENSSL_free(s->ext.tls13_cookie);
+    s->ext.tls13_cookie = NULL;
     s->ext.tls13_cookie_len = 0;
 
     return ret;