Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

tls: catch race condition to prevent memory leak #9064

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xs doesn't seem to be needed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops! Will fix that.

this._done();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please paste a console.trace() at this place when the bug manifests itself? I suppose that it comes from the shutdown handling line.

});
}
}


Expand Down
45 changes: 45 additions & 0 deletions test/internet/test-tls-ensure-ssl-free.js
Original file line number Diff line number Diff line change
@@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this problem manifest itself when connecting to node.js server? If not - what is the difference?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, without doing anything fancy and just connecting and sending data is not enough to reproduce this issue. We'll need to reconstruct what happens with communication with google, likely down to timing and such.

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);
});