Browse Source

crypto: do not move half-filled write head

Might cause write head running over read head, when there were no
allocation and `Commit()` was called. Source of at least one test
failure on windows (`simple/test-https-drain.js`).
v0.11.3-release
Fedor Indutny 12 years ago
parent
commit
4ae96c885b
  1. 4
      src/node_crypto_bio.cc

4
src/node_crypto_bio.cc

@ -315,6 +315,7 @@ void NodeBIO::Write(const char* data, size_t size) {
// Go to next buffer if there still are some bytes to write // Go to next buffer if there still are some bytes to write
if (left != 0) { if (left != 0) {
assert(write_head_->write_pos_ == kBufferLength);
TryAllocateForWrite(); TryAllocateForWrite();
write_head_ = write_head_->next_; write_head_ = write_head_->next_;
} }
@ -342,7 +343,8 @@ void NodeBIO::Commit(size_t size) {
// Allocate new buffer if write head is full, // Allocate new buffer if write head is full,
// and there're no other place to go // and there're no other place to go
TryAllocateForWrite(); TryAllocateForWrite();
write_head_ = write_head_->next_; if (write_head_->write_pos_ == kBufferLength)
write_head_ = write_head_->next_;
} }

Loading…
Cancel
Save