Fix a leak in SSL_clear()

[openssl.git] / ssl / record / ssl3_buffer.c

diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
index df1f90092c47969769ec1d8e39ec57c125bfd2fb..8a6a922261af36b6114ddeb04e5051cd00c2064d 100644 (file)
--- a/ssl/record/ssl3_buffer.c
+++ b/ssl/record/ssl3_buffer.c
@@ -105,13 +105,17 @@ int ssl3_setup_write_buffer(SSL *s, size_t numwpipes, size_t len)
 
     wb = RECORD_LAYER_get_wbuf(&s->rlayer);
     for (currpipe = 0; currpipe < numwpipes; currpipe++) {
 
     wb = RECORD_LAYER_get_wbuf(&s->rlayer);
     for (currpipe = 0; currpipe < numwpipes; currpipe++) {

-        if (wb[currpipe].buf == NULL) {
-            if ((p = OPENSSL_malloc(len)) == NULL) {
+        SSL3_BUFFER *thiswb = &wb[currpipe];
+
+        if (thiswb->buf == NULL) {
+            p = OPENSSL_malloc(len);
+            if (p == NULL) {

                 s->rlayer.numwpipes = currpipe;
                 goto err;
             }
                 s->rlayer.numwpipes = currpipe;
                 goto err;
             }

-            wb[currpipe].buf = p;
-            wb[currpipe].len = len;
+            memset(thiswb, 0, sizeof(SSL3_BUFFER));
+            thiswb->buf = p;
+            thiswb->len = len;

         }
     }
 
         }
     }