fix(RemoteChar): Release task on BLE_HS_EDONE only

Author: thekurtovic

src/NimBLERemoteCharacteristic.cpp

@@ -72,19 +72,22 @@ int NimBLERemoteCharacteristic::descriptorDiscCB(
     const auto pChr      = (NimBLERemoteCharacteristic*)pTaskData->m_pInstance;
     const auto uuid      = filter->uuid; // UUID to filter for
 
-    if (pChr->getHandle() != chrHandle) {
-        return 0; // Descriptor not for this characteristic
-    }
-    // Return early if not the descriptor we are looking for if filter exists
-    if (rc != 0 || (uuid && ble_uuid_cmp(uuid->getBase(), &dsc->uuid.u))) {
+    // Error/Done; or
+    // Wrong characteristic; or
+    // Descriptor does not match UUID filter
+    if (rc != 0 || pChr->getHandle() != chrHandle
+      || (uuid && ble_uuid_cmp(uuid->getBase(), &dsc->uuid.u))) {
         goto Done;
     }
-
-    rc = !!uuid * BLE_HS_EDONE; // If found the descriptor, stop the search
+    // Results added until BLE_HS_EDONE is received
     pChr->m_vDescriptors.push_back(new NimBLERemoteDescriptor(pChr, dsc));
+    // Return BLE_HS_EDONE if the descriptor was found, stop the search
+    rc = !!uuid * BLE_HS_EDONE;
 
 Done:
-    NimBLEUtils::taskRelease(*pTaskData, rc);
+    if (rc == BLE_HS_EDONE) {
+        NimBLEUtils::taskRelease(*pTaskData, rc);
+    }
     NIMBLE_LOGD(LOG_TAG, "<< Descriptor Discovery");
     return rc;
 }