2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
                         if (rr->length == 0) {
                                 s->rstate = SSL_ST_READ_HEADER;
                                 rr->off = 0;
-                                if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+                                if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                                    s->s3->rbuf.left == 0)
                                         ssl3_release_read_buffer(s);
                         }
                 }
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
                         if (rr->length == 0) {
                                 s->rstate = SSL_ST_READ_HEADER;
                                 rr->off = 0;
-                                if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+                                if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                                    s->s3->rbuf.left == 0)
                                         ssl3_release_read_buffer(s);
                         }
                 }