Skip to content

Safer and more efficient handling of the internal whitelist #1087

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
doudar wants to merge 7 commits into
base: master
Choose a base branch
from
+7 −4
Open

Safer and more efficient handling of the internal whitelist #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0a6321
Initial plan
Copilot Feb 12, 2026
3322b6e
Tighten whitelist handling and bounds checks
Copilot Feb 12, 2026
fc0778f
Always shrink whitelist after removal
Copilot Feb 12, 2026
b5bde90
Clarify whitelist removal flow
Copilot Feb 12, 2026
1eb35e8
Update status
Copilot Feb 12, 2026
e138ad1
Remove CodeQL artifact
Copilot Feb 12, 2026
42bc377
Merge pull request #5 from doudar/copilot/refactor-nimbledevice-code
doudar Feb 12, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
docs/doxydocs
.development
_codeql_detected_source_root
10 changes: 6 additions & 4 deletions src/NimBLEDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,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 @@ -738,14 +738,16 @@ 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());
auto* list = m_whiteList.empty() ? nullptr : reinterpret_cast<ble_addr_t*>(m_whiteList.data());
int rc = ble_gap_wl_set(list, 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);
m_whiteList.shrink_to_fit();
break;
}
}

Expand All @@ -766,7 +768,7 @@ size_t NimBLEDevice::getWhiteListCount() {
* @returns The NimBLEAddress at the whitelist index or null address if not found.
*/
NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
if (index > m_whiteList.size()) {
if (index >= m_whiteList.size()) { // HA HA AI FOUND AN ERROR!
NIMBLE_LOGE(LOG_TAG, "Invalid index; %u", index);
return NimBLEAddress{};
}
Expand Down
Loading