From ba570755b30f617e177c4575d34b0aecfccc3ada Mon Sep 17 00:00:00 2001 From: "armansito@chromium.org" Date: Mon, 28 Oct 2013 21:15:57 +0000 Subject: Fix NFC related crash in DBusThreadManager destructor. DBusThreadManager declared its pointers to NfcAdapterClient and NfcManagerClient in the incorrect order, without respecting the NfcAdapterClient dependency on NfcManagerClient. Fixed it, so that NfcManagerClient will be cleaned up after NfcAdapterClient. BUG=312243 R=stevenjb@chromium.org Review URL: https://codereview.chromium.org/49273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231403 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/dbus/dbus_thread_manager.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chromeos') diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index 21794b5..b98e07c 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -404,8 +404,11 @@ class DBusThreadManagerImpl : public DBusThreadManager { scoped_ptr image_burner_client_; scoped_ptr introspectable_client_; scoped_ptr modem_messaging_client_; - scoped_ptr nfc_adapter_client_; + // NfcAdapterClient depends on NfcManagerClient. We declare NfcManagerClient + // first, so that it won't be deallocated before NfcAdapterClient is done + // cleaning up. scoped_ptr nfc_manager_client_; + scoped_ptr nfc_adapter_client_; scoped_ptr permission_broker_client_; scoped_ptr system_clock_client_; scoped_ptr power_manager_client_; -- cgit v1.1