removed double delete of characteristics (#3521)
This commit is contained in:
parent
7b613c1238
commit
5999b7ba46
@ -302,13 +302,10 @@ std::string BLERemoteService::getValue(BLEUUID characteristicUuid) {
|
|||||||
* @return N/A.
|
* @return N/A.
|
||||||
*/
|
*/
|
||||||
void BLERemoteService::removeCharacteristics() {
|
void BLERemoteService::removeCharacteristics() {
|
||||||
for (auto &myPair : m_characteristicMap) {
|
|
||||||
delete myPair.second;
|
|
||||||
//m_characteristicMap.erase(myPair.first); // Should be no need to delete as it will be deleted by the clear
|
|
||||||
}
|
|
||||||
m_characteristicMap.clear(); // Clear the map
|
m_characteristicMap.clear(); // Clear the map
|
||||||
for (auto &myPair : m_characteristicMapByHandle) {
|
for (auto &myPair : m_characteristicMapByHandle) {
|
||||||
delete myPair.second;
|
delete myPair.second;
|
||||||
|
// delete the characteristics only once
|
||||||
}
|
}
|
||||||
m_characteristicMapByHandle.clear(); // Clear the map
|
m_characteristicMapByHandle.clear(); // Clear the map
|
||||||
} // removeCharacteristics
|
} // removeCharacteristics
|
||||||
|
Loading…
Reference in New Issue
Block a user