diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 06:51:32 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 06:51:32 +0000 |
| commit | 372c41929555203fa3c3207518065de72a2722aa (patch) | |
| tree | b6e29b29afcbe368366b7faba1123d9148e7845f /chromeos/dbus/shill_client_helper.h | |
| parent | 7356269f3aaa08557aba07446faba08e57f6bd4e (diff) | |
| download | chromium_src-372c41929555203fa3c3207518065de72a2722aa.zip chromium_src-372c41929555203fa3c3207518065de72a2722aa.tar.gz chromium_src-372c41929555203fa3c3207518065de72a2722aa.tar.bz2 | |
This fixes a crash in ShillDeviceClient when the helper is NULL.
BUG=chromium:170541
Review URL: https://chromiumcodereview.appspot.com/12091076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_client_helper.h')
| -rw-r--r-- | chromeos/dbus/shill_client_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/dbus/shill_client_helper.h b/chromeos/dbus/shill_client_helper.h index a049b7d..b8f769c 100644 --- a/chromeos/dbus/shill_client_helper.h +++ b/chromeos/dbus/shill_client_helper.h @@ -178,7 +178,8 @@ class ShillClientHelper { BlockingMethodCaller blocking_method_caller_; dbus::ObjectProxy* proxy_; PropertyChangedHandler property_changed_handler_; - ObserverList<ShillPropertyChangedObserver> observer_list_; + ObserverList<ShillPropertyChangedObserver, true /* check_empty */> + observer_list_; // Note: This should remain the last member so it'll be destroyed and // invalidate its weak pointers before any other members are destroyed. |