diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 21:18:59 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 21:18:59 +0000 |
| commit | c45d12c0186dbf6a1ffdbb7cb45a15c2366d9dcf (patch) | |
| tree | c443d09430e63937bee60a01d54d2184e7db398e /chromeos/dbus/shill_device_client.cc | |
| parent | 1bcf001748ed3d6e5d305587f069ac2ae02aae5a (diff) | |
| download | chromium_src-c45d12c0186dbf6a1ffdbb7cb45a15c2366d9dcf.zip chromium_src-c45d12c0186dbf6a1ffdbb7cb45a15c2366d9dcf.tar.gz chromium_src-c45d12c0186dbf6a1ffdbb7cb45a15c2366d9dcf.tar.bz2 | |
Revert 224179 "Track active references in ShillClientHelper"
Use after free on ASAN chromiumos.
> Track active references in ShillClientHelper
> To prevent Shill Service DBus ObjectProxy instances from accumulating,
> remove them when the service becomes inactive.
>
> BUG=223483
>
> Review URL: https://chromiumcodereview.appspot.com/23658053
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/24293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_device_client.cc')
| -rw-r--r-- | chromeos/dbus/shill_device_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc index cde511a..420f586 100644 --- a/chromeos/dbus/shill_device_client.cc +++ b/chromeos/dbus/shill_device_client.cc @@ -215,7 +215,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { // There is no helper for the profile, create it. dbus::ObjectProxy* object_proxy = bus_->GetObjectProxy(flimflam::kFlimflamServiceName, device_path); - ShillClientHelper* helper = new ShillClientHelper(object_proxy); + ShillClientHelper* helper = new ShillClientHelper(bus_, object_proxy); CHECK(helper) << "Unable to create Shill client helper."; helper->MonitorPropertyChanged(flimflam::kFlimflamDeviceInterface); helpers_.insert(HelperMap::value_type(device_path.value(), helper)); |