diff options
| author | Anna Henningsen <anna@addaleax.net> | 2018-07-11 00:59:53 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-07-15 20:35:35 +0200 |
| commit | 266a7e62585b975f2ea2d25473b21395f5ca5a3f (patch) | |
| tree | 0e5229e042517620784aea2f8114c2cf3d287bb7 /src/tls_wrap.cc | |
| parent | d2a1408f119181675d9d3f20982ccd863443baad (diff) | |
| download | android-node-v8-266a7e62585b975f2ea2d25473b21395f5ca5a3f.tar.gz android-node-v8-266a7e62585b975f2ea2d25473b21395f5ca5a3f.tar.bz2 android-node-v8-266a7e62585b975f2ea2d25473b21395f5ca5a3f.zip | |
src: use V8 graph heap snapshot API
Transition to a newer, more flexible API for
heap snapshot creation.
This addresses a currently pending deprecation in the V8 API.
PR-URL: https://github.com/nodejs/node/pull/21741
Fixes: https://github.com/nodejs/node/issues/21633
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'src/tls_wrap.cc')
| -rw-r--r-- | src/tls_wrap.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 0d0791b710..3efa6adb4e 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -758,6 +758,8 @@ void TLSWrap::DestroySSL(const FunctionCallbackInfo<Value>& args) { // Destroy the SSL structure and friends wrap->SSLWrap<TLSWrap>::DestroySSL(); + wrap->enc_in_ = nullptr; + wrap->enc_out_ = nullptr; if (wrap->stream_ != nullptr) wrap->stream_->RemoveStreamListener(wrap); @@ -868,8 +870,10 @@ void TLSWrap::MemoryInfo(MemoryTracker* tracker) const { tracker->TrackThis(this); tracker->TrackField("error", error_); tracker->TrackField("pending_cleartext_input", pending_cleartext_input_); - tracker->TrackField("enc_in", crypto::NodeBIO::FromBIO(enc_in_)); - tracker->TrackField("enc_out", crypto::NodeBIO::FromBIO(enc_out_)); + if (enc_in_ != nullptr) + tracker->TrackField("enc_in", crypto::NodeBIO::FromBIO(enc_in_)); + if (enc_out_ != nullptr) + tracker->TrackField("enc_out", crypto::NodeBIO::FromBIO(enc_out_)); } |