From b8a2b5f1c28c62fed888ebd49abc9b0a01f3eb7a Mon Sep 17 00:00:00 2001
From: "Wraithan (Chris McDonald)" <wmcdonald@newrelic.com>
Date: Mon, 19 Jan 2015 22:04:18 -0800
Subject: [PATCH] tls: catch race condition to prevent memory leak

The CrytpoStream pair could be ended in an order that would result in
not only the streams themselves being leaked, but the underlying ssl
objects as well. This manifests itself as a native heap leak and can
be reproduced against google.com
---
 lib/tls.js                                |  8 ++++
 test/internet/test-tls-ensure-ssl-free.js | 45 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 test/internet/test-tls-ensure-ssl-free.js

diff --git a/lib/tls.js b/lib/tls.js
index e3b90832236f..d9690b7dba2e 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -321,6 +321,14 @@ function onCryptoStreamEnd() {
   }
 
   if (this.onend) this.onend();
+
+  if (this._opposite._finished &&
+      !this._opposite._ended &&
+      !this._opposite._doneFlag) {
+    this._opposite.once('end', function(xs) {
+      this._done();
+    });
+  }
 }
 
 
diff --git a/test/internet/test-tls-ensure-ssl-free.js b/test/internet/test-tls-ensure-ssl-free.js
new file mode 100644
index 000000000000..3cb3cac99d1b
--- /dev/null
+++ b/test/internet/test-tls-ensure-ssl-free.js
@@ -0,0 +1,45 @@
+// 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.
+var assert = require('assert');
+var https = require('https');
+
+var wasClosed = 0;
+var options = {
+  host: 'google.com',
+  rejectUnauthorized: false,
+  agent: false
+};
+
+https.get(options, function(res) {
+  var originalClose = res.socket.pair.ssl.close;
+
+  res.socket.pair.ssl.close = function() {
+    wasClosed++;
+    return originalClose.apply(this, arguments);
+  };
+
+  res.resume();
+});
+
+process.on('exit', function() {
+  assert.equal(wasClosed, 1);
+});
+