diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 23:57:34 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 23:57:34 +0000 |
| commit | dd0ab8630c88e1dff59c07b5ac81e353a24a3a09 (patch) | |
| tree | bef8292d7a54931279b9342a16118a2666649d23 /chrome/browser/chromeos/cros/network_library.cc | |
| parent | bba8416180d28035680105683e36e314ede34c8b (diff) | |
| download | chromium_src-dd0ab8630c88e1dff59c07b5ac81e353a24a3a09.zip chromium_src-dd0ab8630c88e1dff59c07b5ac81e353a24a3a09.tar.gz chromium_src-dd0ab8630c88e1dff59c07b5ac81e353a24a3a09.tar.bz2 | |
Fix for crash (chromium-os:8733)
BUG=chromium-os:8733
TEST=Quit from a ChromeOS device with a cellular network enabled; confirm that Chrome does not crash.
Review URL: http://codereview.chromium.org/4507001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 3aecc25..57bab2a 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -1158,7 +1158,10 @@ class NetworkLibraryImpl : public NetworkLibrary { const char* modem_service_path, const CellularDataPlanList* dataplan) { NetworkLibraryImpl* networklib = static_cast<NetworkLibraryImpl*>(object); - DCHECK(networklib && networklib->cellular_network()); + if (!networklib || !networklib->cellular_network()) { + // This might happen if an update is received as we are shutting down. + return; + } // Store data plan for currently connected cellular network. if (networklib->cellular_network()->service_path() .compare(modem_service_path) == 0) { |