commit a784665e52735f77a64d01216d7535834278c27c
author Dr. Stephen Henson <steve@openssl.org> Tue Jul 28 16:04:53 2015 +0100
committer Dr. Stephen Henson <steve@openssl.org> Thu Jul 30 14:55:33 2015 +0100
tree eeacc2c8638667e106d1074714f54dd06d9963ac
parent a3f7ff2b2d1b1267cdf0bbce2374ebe149ed264a

Free and cleanse pms on error

Reviewed-by: Matt Caswell <matt@openssl.org>

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 2954b58..0fc0881 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -4966,8 +4966,10 @@
 
         pskpmslen = 4 + pmslen + psklen;
         pskpms = OPENSSL_malloc(pskpmslen);
-        if (pskpms == NULL)
-            return 0;
+        if (pskpms == NULL) {
+            s->session->master_key_length = 0;
+            goto err;
+        }
         t = pskpms;
         s2n(pmslen, t);
         if (alg_k & SSL_kPSK)
@@ -4991,6 +4993,8 @@
             s->method->ssl3_enc->generate_master_secret(s,
                                                         s->session->master_key,
                                                         pms, pmslen);
+
+    err:
     if (pms) {
         if (free_pms)
             OPENSSL_clear_free(pms, pmslen);