Skip to content

[Bugfix] Use the correct taskData when retrieving descriptors #422

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

Merged
h2zero merged 1 commit into from
Apr 24, 2026
Merged

[Bugfix] Use the correct taskData when retrieving descriptors #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/NimBLERemoteCharacteristic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@

# include <climits>

// Private structure used to filter descriptors during discovery and return results.
struct NimBLEDescriptorFilter {
NimBLERemoteDescriptor* dsc;
NimBLEDescriptorFilter() = delete;
NimBLEDescriptorFilter(const NimBLEUUID* uuid, NimBLEUtils::TaskData* td = nullptr) : uuid(uuid), taskData(td) {}
const NimBLEUUID* uuid;
Comment thread
h2zero marked this conversation as resolved.
void* taskData;
NimBLEUtils::TaskData* taskData;
NimBLERemoteDescriptor* dsc{nullptr};
};

static const char* LOG_TAG = "NimBLERemoteCharacteristic";
Expand Down Expand Up @@ -117,9 +120,11 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(NimBLEDescriptorFilter* pFi
}

NimBLEUtils::TaskData taskData(const_cast<NimBLERemoteCharacteristic*>(this));
NimBLEDescriptorFilter defaultFilter{nullptr, nullptr, &taskData};
NimBLEDescriptorFilter defaultFilter(nullptr, &taskData);
if (pFilter == nullptr) {
pFilter = &defaultFilter;
} else {
pFilter->taskData = &taskData;
}

int rc = ble_gattc_disc_all_dscs(getClient()->getConnHandle(),
Expand All @@ -134,7 +139,7 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(NimBLEDescriptorFilter* pFi

auto prevDscCount = m_vDescriptors.size();
NimBLEUtils::taskWait(taskData, BLE_NPL_TIME_FOREVER);
rc = ((NimBLEUtils::TaskData*)pFilter->taskData)->m_flags;
rc = taskData.m_flags;
if (rc != BLE_HS_EDONE) {
NIMBLE_LOGE(LOG_TAG, "<< retrieveDescriptors(): failed: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
return false;
Expand All @@ -156,8 +161,7 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(NimBLEDescriptorFilter* pFi
NimBLERemoteDescriptor* NimBLERemoteCharacteristic::getDescriptor(const NimBLEUUID& uuid) const {
NIMBLE_LOGD(LOG_TAG, ">> getDescriptor: uuid: %s", uuid.toString().c_str());
NimBLEUUID uuidTmp{uuid};
NimBLEUtils::TaskData taskData(const_cast<NimBLERemoteCharacteristic*>(this));
NimBLEDescriptorFilter filter{nullptr, &uuidTmp, &taskData};
NimBLEDescriptorFilter filter(&uuidTmp);

for (const auto& dsc : m_vDescriptors) {
if (dsc->getUUID() == uuid) {
Expand Down