device/bluetooth/bluetooth_discovery_session.cc - Issue 188473002: device/bluetooth: Remove BluetoothAdapter::Start|StopDiscovering.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_discovery_session.cc

Issue 188473002: device/bluetooth: Remove BluetoothAdapter::Start|StopDiscovering. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed potential invalid access in BluetoothDiscoverySession destructor. Created 6 years, 9 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:

Index: device/bluetooth/bluetooth_discovery_session.cc

diff --git a/device/bluetooth/bluetooth_discovery_session.cc b/device/bluetooth/bluetooth_discovery_session.cc

index 076123e3ad8f97c08461aead83370581cf8bed54..355bdf63da5132fe95025aaec39d28c16c9ce432 100644

--- a/device/bluetooth/bluetooth_discovery_session.cc

+++ b/device/bluetooth/bluetooth_discovery_session.cc

@@ -23,9 +23,11 @@ BluetoothDiscoverySession::BluetoothDiscoverySession()

}

BluetoothDiscoverySession::~BluetoothDiscoverySession() {

- if (!active_)

+ // |adapter_| may be NULL if this instance was initialized as a mock.

+ if (!adapter_.get()) {

+ DCHECK(!active_);

return;

- DCHECK(adapter_.get());

+ }

Stop(base::Bind(&base::DoNothing), base::Bind(&base::DoNothing));

adapter_->DiscoverySessionDestroyed(this);

}