Skip to content

fix: whiteListRemove use-after-free — loop continues on invalidated iterator #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sanastasiou wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −2
Open

fix: whiteListRemove use-after-free — loop continues on invalidated iterator #1172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2534e1d
fix: whiteListRemove use-after-free - stop iterating after erase + sh…
sanastasiou Jul 16, 2026
9477550
fix: use m_whiteList.data() - operator[] on an empty vector is UB
sanastasiou Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/NimBLEDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ bool NimBLEDevice::onWhiteList(const NimBLEAddress& address) {
bool NimBLEDevice::whiteListAdd(const NimBLEAddress& address) {
if (!NimBLEDevice::onWhiteList(address)) {
m_whiteList.push_back(address);
int rc = ble_gap_wl_set(reinterpret_cast<ble_addr_t*>(&m_whiteList[0]), m_whiteList.size());
int rc = ble_gap_wl_set(reinterpret_cast<ble_addr_t*>(m_whiteList.data()), m_whiteList.size());
if (rc != 0) {
NIMBLE_LOGE(LOG_TAG, "Failed adding to whitelist rc=%d", rc);
m_whiteList.pop_back();
Expand All @@ -748,14 +748,18 @@ bool NimBLEDevice::whiteListRemove(const NimBLEAddress& address) {
for (auto it = m_whiteList.begin(); it < m_whiteList.end(); ++it) {
if (*it == address) {
m_whiteList.erase(it);
int rc = ble_gap_wl_set(reinterpret_cast<ble_addr_t*>(&m_whiteList[0]), m_whiteList.size());
int rc = ble_gap_wl_set(reinterpret_cast<ble_addr_t*>(m_whiteList.data()), m_whiteList.size());
if (rc != 0) {
m_whiteList.push_back(address);
NIMBLE_LOGE(LOG_TAG, "Failed removing from whitelist rc=%d", rc);
return false;
}

std::vector<NimBLEAddress>(m_whiteList).swap(m_whiteList);
break; // `it` was invalidated by erase() and its buffer freed by the
// swap above; continuing would iterate a dangling iterator.
// Duplicates are impossible (whiteListAdd checks onWhiteList),
// so a single match is total.
}
}

Expand Down
Loading