GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — tls: unconsume stream on destroy · nodejs/node@56e1586

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- tls_wrap.cc
test/parallel
- test-tls-transport-destroy-after-own-gc.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/tls_wrap.cc‎`

Copy file name to clipboardExpand all lines: src/tls_wrap.cc

+19-2Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,19 @@ TLSWrap::~TLSWrap() {`
`82`	`82`	`#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB`
`83`	`83`	`sni_context_.Reset();`
`84`	`84`	`#endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB`
	`85`	`+`
	`86`	`+ // See test/parallel/test-tls-transport-destroy-after-own-gc.js:`
	`87`	`+ // If this TLSWrap is garbage collected, we cannot allow callbacks to be`
	`88`	`+ // called on this stream.`
	`89`	`+`
	`90`	`+ if (stream_ == nullptr)`
	`91`	`+ return;`
	`92`	`+ stream_->set_destruct_cb({ nullptr, nullptr });`
	`93`	`+ stream_->set_after_write_cb({ nullptr, nullptr });`
	`94`	`+ stream_->set_alloc_cb({ nullptr, nullptr });`
	`95`	`+ stream_->set_read_cb({ nullptr, nullptr });`
	`96`	`+ stream_->set_destruct_cb({ nullptr, nullptr });`
	`97`	`+ stream_->Unconsume();`
`85`	`98`	`}`
`86`	`99`
`87`	`100`
`@@ -545,12 +558,16 @@ uint32_t TLSWrap::UpdateWriteQueueSize(uint32_t write_queue_size) {`
`545`	`558`
`546`	`559`
`547`	`560`	`int TLSWrap::ReadStart() {`
`548`		`- return stream_->ReadStart();`
	`561`	`+ if (stream_ != nullptr)`
	`562`	`+ return stream_->ReadStart();`
	`563`	`+ return 0;`
`549`	`564`	`}`
`550`	`565`
`551`	`566`
`552`	`567`	`int TLSWrap::ReadStop() {`
`553`		`- return stream_->ReadStop();`
	`568`	`+ if (stream_ != nullptr)`
	`569`	`+ return stream_->ReadStop();`
	`570`	`+ return 0;`
`554`	`571`	`}`
`555`	`572`
`556`	`573`

Collapse file

`‎test/parallel/test-tls-transport-destroy-after-own-gc.js‎`

Copy file name to clipboard

+30Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,30 @@`
	`1`	`+// Flags: --expose-gc`
	`2`	`+'use strict';`
	`3`	`+`
	`4`	`+// Regression test for https://github.com/nodejs/node/issues/17475`
	`5`	`+// Unfortunately, this tests only "works" reliably when checked with valgrind or`
	`6`	`+// a similar tool.`
	`7`	`+`
	`8`	`+const common = require('../common');`
	`9`	`+if (!common.hasCrypto)`
	`10`	`+ common.skip('missing crypto');`
	`11`	`+`
	`12`	`+const { TLSSocket } = require('tls');`
	`13`	`+const makeDuplexPair = require('../common/duplexpair');`
	`14`	`+`
	`15`	`+let { clientSide } = makeDuplexPair();`
	`16`	`+`
	`17`	`+let clientTLS = new TLSSocket(clientSide, { isServer: false });`
	`18`	`+// eslint-disable-next-line no-unused-vars`
	`19`	`+let clientTLSHandle = clientTLS._handle;`
	`20`	`+`
	`21`	`+setImmediate(() => {`
	`22`	`+ clientTLS = null;`
	`23`	`+ global.gc();`
	`24`	`+ clientTLSHandle = null;`
	`25`	`+ global.gc();`
	`26`	`+ setImmediate(() => {`
	`27`	`+ clientSide = null;`
	`28`	`+ global.gc();`
	`29`	`+ });`
	`30`	`+});`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.