diff options
| author | George Burgess <gbiv@google.com> | 2022-01-05 19:54:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-05 19:54:52 +0000 |
| commit | 1fc9409c62c3cc95b84c12c889e78bd32be79dfa (patch) | |
| tree | 91770e50b6b3da32bc92ee82ee013c20ccbd5c47 | |
| parent | eacca8edf9beb144c1753e9ce44f0ae314a0dd4d (diff) | |
| parent | 557977fb0d475fa4b199806a3115e02822915922 (diff) | |
Merge "security: fix a potential dereference of nullptr" am: 2d2f6ab04f am: f24d6b66b1 am: a3f6dc764b am: 557977fb0d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1892729
Change-Id: I5338694571340b471cb564bb063a53488b8069a7
| -rw-r--r-- | system/gd/security/internal/security_manager_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/gd/security/internal/security_manager_impl.cc b/system/gd/security/internal/security_manager_impl.cc index 46d2e22cf4..4e21bc9c62 100644 --- a/system/gd/security/internal/security_manager_impl.cc +++ b/system/gd/security/internal/security_manager_impl.cc @@ -701,7 +701,9 @@ void SecurityManagerImpl::OnPairingFinished(security::PairingResultOrFailure pai PairingFailure failure = std::get<PairingFailure>(pairing_result); LOG_INFO(" ■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ failure message: %s", failure.message.c_str()); - NotifyDeviceBondFailed(stored_chan->channel_->GetDevice(), failure); + if (stored_chan) { + NotifyDeviceBondFailed(stored_chan->channel_->GetDevice(), failure); + } return; } |