Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/network/auto_connect_handler.cc

Issue 1562593002: Fix potential crashes in NetworkHandler code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/io_thread.cc ('k') | chromeos/network/client_cert_resolver.h » ('j') | chromeos/network/network_state_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/auto_connect_handler.cc
diff --git a/chromeos/network/auto_connect_handler.cc b/chromeos/network/auto_connect_handler.cc
index b44478936775f27282fa1a76c89fb02d64a177e5..4411b18e0914e9bac770ab6164a91434a9733bb7 100644
--- a/chromeos/network/auto_connect_handler.cc
+++ b/chromeos/network/auto_connect_handler.cc
@@ -37,10 +37,12 @@ AutoConnectHandler::AutoConnectHandler()
}
AutoConnectHandler::~AutoConnectHandler() {
- if (client_cert_resolver_)
- client_cert_resolver_->RemoveObserver(this);
if (LoginState::IsInitialized())
LoginState::Get()->RemoveObserver(this);
+ if (client_cert_resolver_)
+ client_cert_resolver_->RemoveObserver(this);
+ if (network_connection_handler_)
+ network_connection_handler_->RemoveObserver(this);
if (network_state_handler_)
network_state_handler_->RemoveObserver(this, FROM_HERE);
if (managed_configuration_handler_)
« chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/io_thread.cc ('k') | chromeos/network/client_cert_resolver.h » ('j') | chromeos/network/network_state_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698