crypto: fix moving read head

Fix various possible stalls of read head (i.e. try moving it after every
write head update).

NOTE: This is actually backported from `bud`.

1 files changed, 16 insertions, 11 deletions

diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
index 84dc42b464..eaf8f76a51 100644
--- a/src/node_crypto_bio.cc
+++ b/src/node_crypto_bio.cc
@@ -223,17 +223,17 @@ void NodeBIO::TryMoveReadHead() {
   // inside the buffer, respectively. When they're equal - its safe to reset
   // them, because both reader and writer will continue doing their stuff
   // from new (zero) positions.
-  if (read_head_->read_pos_ != read_head_->write_pos_)
-    return;
-
-  // Reset positions
-  read_head_->read_pos_ = 0;
-  read_head_->write_pos_ = 0;
+  while (read_head_->read_pos_ != 0 &&
+         read_head_->read_pos_ == read_head_->write_pos_) {
+    // Reset positions
+    read_head_->read_pos_ = 0;
+    read_head_->write_pos_ = 0;
 
-  // Move read_head_ forward, just in case if there're still some data to
-  // read in the next buffer.
-  if (read_head_ != write_head_)
-    read_head_ = read_head_->next_;
+    // Move read_head_ forward, just in case if there're still some data to
+    // read in the next buffer.
+    if (read_head_ != write_head_)
+      read_head_ = read_head_->next_;
+  }
 }
 
 
@@ -397,8 +397,13 @@ void NodeBIO::Commit(size_t size) {
   // Allocate new buffer if write head is full,
   // and there're no other place to go
   TryAllocateForWrite();
-  if (write_head_->write_pos_ == kBufferLength)
+  if (write_head_->write_pos_ == kBufferLength) {
     write_head_ = write_head_->next_;
+
+    // Additionally, since we're moved to the next buffer, read head
+    // may be moved as well.
+    TryMoveReadHead();
+  }
 }