languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 11:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dart:io] Eagerly deallocate SSLFilter internals

Browse source 
related #29006

R=rmacnak@google.com

Review-Url: https://codereview.chromium.org/2741063003 .
This commit is contained in:
Zachary Anderson 2017-03-10 10:23:48 -08:00
parent 0fc6d86552
commit 7114d6cdcd
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
runtime/bin/secure_socket_boringssl.cc
View file

@ -261,12 +261,16 @@ void FUNCTION_NAME(SecureSocket_Connect)(Dart_NativeArguments args) {
void FUNCTION_NAME(SecureSocket_Destroy)(Dart_NativeArguments args) {
SSLFilter* filter = GetFilter(args);
// The SSLFilter is deleted in the finalizer for the Dart object created by
// SetFilter. There is no need to NULL-out the native field for the SSLFilter
// here because the SSLFilter won't be deleted until the finalizer for the
// Dart object runs while the Dart object is being GCd. This approach avoids a
// leak if Destroy isn't called, and avoids a NULL-dereference if Destroy is
// called more than once.
// There are two paths that can clean up an SSLFilter object. First,
// there is this explicit call to Destroy(), called from
// _SecureFilter.destroy() in Dart code. After a call to destroy(), the Dart
// code maintains the invariant that there will be no futher SSLFilter
// requests sent to the IO Service. Therefore, the internals of the SSLFilter
// are safe to deallocate, but not the SSLFilter itself, which is already
// set up to be cleaned up by the finalizer.
//
// The second path is through the finalizer, which we have to do in case
// some mishap prevents a call to _SecureFilter.destroy().
filter->Destroy();
}
@ -1661,7 +1665,7 @@ void SSLFilter::Renegotiate(bool use_session_cache,
}
SSLFilter::~SSLFilter() {
void SSLFilter::FreeResources() {
if (ssl_ != NULL) {
SSL_free(ssl_);
ssl_ = NULL;
@ -1683,6 +1687,11 @@ SSLFilter::~SSLFilter() {
}
SSLFilter::~SSLFilter() {
FreeResources();
}
void SSLFilter::Destroy() {
for (int i = 0; i < kNumBuffers; ++i) {
if (dart_buffer_objects_[i] != NULL) {
@ -1706,6 +1715,7 @@ void SSLFilter::Destroy() {
Dart_DeletePersistentHandle(bad_certificate_callback_);
bad_certificate_callback_ = NULL;
}
FreeResources();
}

1
runtime/bin/secure_socket_boringssl.h
View file

@ -106,6 +106,7 @@ class SSLFilter : public ReferenceCounted<SSLFilter> {
bool require_client_certificate,
Dart_Handle protocols_handle);
void Destroy();
void FreeResources();
void Handshake();
void GetSelectedProtocol(Dart_NativeArguments args);
void Renegotiate(bool use_session_cache,