crypto: ensure that read head is always non-empty

indutny · indutny · commit 5dd155a3bb04 · 2013-06-15T21:43:24.000+02:00
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
@@ -203,8 +203,10 @@ size_t NodeBIO::Read(char* out, size_t size) {
       read_head_->write_pos_ = 0;
 
       // But not get beyond write_head_
-      if (bytes_read != expected)
+      if (length_ != bytes_read) {
+        assert(read_head_ != write_head_);
         read_head_ = read_head_->next_;
+      }
     }
   }
   assert(expected == bytes_read);

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,10 @@ size_t NodeBIO::Read(char* out, size_t size) {`
`203`	`203`	`read_head_->write_pos_ = 0;`
`204`	`204`
`205`	`205`	`// But not get beyond write_head_`
`206`		`- if (bytes_read != expected)`
	`206`	`+ if (length_ != bytes_read) {`
	`207`	`+ assert(read_head_ != write_head_);`
`207`	`208`	`read_head_ = read_head_->next_;`
	`209`	`+ }`
`208`	`210`	`}`
`209`	`211`	`}`
`210`	`212`	`assert(expected == bytes_read);`