2 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 60c51146ac..5ef25a4059 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -619,6 +619,10 @@ do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                 if (i <= 0)
                         return (i);
                 /* if it went, fall through and send more stuff */
+                /* we may have released our buffer, so get it again */
+                if (wb->buf == NULL)
+                        if (!ssl3_setup_write_buffer(s))
+                                return -1;
         }
 
         if (len == 0 && !create_empty_fragment)
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index 60c51146ac..5ef25a4059 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -619,6 +619,10 @@ do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                 if (i <= 0)
                         return (i);
                 /* if it went, fall through and send more stuff */
+                /* we may have released our buffer, so get it again */
+                if (wb->buf == NULL)
+                        if (!ssl3_setup_write_buffer(s))
+                                return -1;
         }
 
         if (len == 0 && !create_empty_fragment)