From eef0715db56f8b9b0207c1b979e4ff9f5acef475 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sun, 8 Jun 2014 11:58:07 -0700
Subject: [PATCH] tls_wrap: fix interleaving in InvokeQueued

WriteItem callback may add new item to the `pending_write_items`. Ensure
that this item won't be called in the same `InvokeQueued` call, as it
may result in way-to-early `finish` event on js-side.

fix #7733

Signed-off-by: Fedor Indutny <fedor@indutny.com>
---
 src/tls_wrap.cc                       |  7 ++-
 test/simple/test-tls-invoke-queued.js | 65 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 test/simple/test-tls-invoke-queued.js

diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index c830de405b3..803bc4edcf7 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -141,8 +141,11 @@ bool TLSCallbacks::InvokeQueued(int status) {
     return false;
 
   // Process old queue
-  while (!QUEUE_EMPTY(&pending_write_items_)) {
-    QUEUE* q = QUEUE_HEAD(&pending_write_items_);
+  QUEUE queue;
+  QUEUE* q = QUEUE_HEAD(&pending_write_items_);
+  QUEUE_SPLIT(&pending_write_items_, q, &queue);
+  while (QUEUE_EMPTY(&queue) == false) {
+    q = QUEUE_HEAD(&queue);
     QUEUE_REMOVE(q);
 
     WriteItem* wi = ContainerOf(&WriteItem::member_, q);
diff --git a/test/simple/test-tls-invoke-queued.js b/test/simple/test-tls-invoke-queued.js
new file mode 100644
index 00000000000..3e877b406ff
--- /dev/null
+++ b/test/simple/test-tls-invoke-queued.js
@@ -0,0 +1,65 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+if (!process.versions.openssl) {
+  console.error('Skipping because node compiled without OpenSSL.');
+  process.exit(0);
+}
+
+var assert = require('assert');
+var fs = require('fs');
+var net = require('net');
+var tls = require('tls');
+
+var common = require('../common');
+
+var received = '';
+var ended = 0;
+
+var server = tls.createServer({
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+}, function(c) {
+  c._write('hello ', null, function() {
+    c._write('world!', null, function() {
+      c.destroy();
+    });
+    c._write(' gosh', null, function() {});
+  });
+
+  server.close();
+}).listen(common.PORT, function() {
+  var c = tls.connect(common.PORT, {
+    rejectUnauthorized: false
+  }, function() {
+    c.on('data', function(chunk) {
+      received += chunk;
+    });
+    c.on('end', function() {
+      ended++;
+    });
+  });
+});
+
+process.on('exit', function() {
+  assert.equal(ended, 1);
+  assert.equal(received, 'hello world! gosh');
+});