From 2ccc8f3970cd1ed78585be37c8d912f3ccf56cd0 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Tue, 24 Mar 2015 20:21:32 -0700 Subject: [PATCH] tls_wrap: fix this incredibly stupid leak Always call `Done` on the WriteWrap, and ensure that `EncOut` will consume all data in clear_in_ and invoke queued callbacks. Fix: https://github.com/iojs/io.js/issues/1075 PR-URL: https://github.com/iojs/io.js/pull/1244 Reviewed-By: Ben Noordhuis --- src/tls_wrap.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index b6b87b3..c774a84 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -90,8 +90,7 @@ TLSWrap::~TLSWrap() { MakePending(); // And destroy - while (WriteItem* wi = pending_write_items_.PopFront()) - delete wi; + InvokeQueued(UV_ECANCELED); ClearError(); } @@ -310,10 +309,12 @@ void TLSWrap::EncOut() { write_req->Dispatched(); // Ignore errors, this should be already handled in js - if (err) + if (err) { write_req->Dispose(); - else + InvokeQueued(err); + } else { NODE_COUNT_NET_BYTES_SENT(write_size_); + } } @@ -335,6 +336,9 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) { // Commit NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_); + // Ensure that the progress will be made and `InvokeQueued` will be called. + wrap->ClearIn(); + // Try writing more data wrap->write_size_ = 0; wrap->EncOut(); -- 2.7.4