Merge pull request arduino-libraries#260 from facchinm/fix_end_hang

facchinm · web-flow · commit 5954d967c251 · 2022-09-05T14:42:45.000+02:00
Fix memory leak on end() -&gt; begin() -&gt; end()
diff --git a/src/BLEService.cpp b/src/BLEService.cpp
@@ -63,6 +63,13 @@ BLEService::BLEService(const BLEService& other)
   }
 }
 
+void BLEService::clear()
+{
+  if (_local) {
+    _local->clear();
+  }
+}
+
 BLEService::~BLEService()
 {
   if (_local && _local->release() == 0) {
diff --git a/src/BLEService.h b/src/BLEService.h
@@ -33,6 +33,7 @@ class BLEService {
   virtual ~BLEService();
 
   const char* uuid() const;
+  void clear();
 
   void addCharacteristic(BLECharacteristic& characteristic);
 
diff --git a/src/local/BLELocalAttribute.cpp b/src/local/BLELocalAttribute.cpp
@@ -56,6 +56,11 @@ int BLELocalAttribute::retain()
   return _refCount;
 }
 
+bool BLELocalAttribute::active()
+{
+  return _refCount > 0;
+}
+
 int BLELocalAttribute::release()
 {
   _refCount--;
diff --git a/src/local/BLELocalAttribute.h b/src/local/BLELocalAttribute.h
@@ -44,6 +44,7 @@ class BLELocalAttribute
 
   int retain();
   int release();
+  bool active();
 
 protected:
   friend class ATTClass;
diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
@@ -46,6 +46,7 @@ BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permis
   if (permissions & (BLENotify | BLEIndicate)) {
     BLELocalDescriptor* cccd = new BLELocalDescriptor("2902", (uint8_t*)&_cccdValue, sizeof(_cccdValue));
   
+    cccd->retain();
     _descriptors.add(cccd);
   }
 
diff --git a/src/local/BLELocalService.cpp b/src/local/BLELocalService.cpp
@@ -28,6 +28,12 @@ BLELocalService::BLELocalService(const char* uuid) :
 {
 }
 
+void BLELocalService::clear() {
+  _characteristics.clear();
+  _startHandle = 0;
+  _endHandle = 0;
+}
+
 BLELocalService::~BLELocalService()
 {
   for (unsigned int i = 0; i < characteristicCount(); i++) {
@@ -37,8 +43,7 @@ BLELocalService::~BLELocalService()
       delete c;
     }
   }
-
-  _characteristics.clear();
+  clear();
 }
 
 enum BLEAttributeType BLELocalService::type() const
diff --git a/src/local/BLELocalService.h b/src/local/BLELocalService.h
@@ -36,6 +36,7 @@ class BLELocalService : public BLELocalAttribute {
   virtual enum BLEAttributeType type() const;
 
   void addCharacteristic(BLECharacteristic& characteristic);
+  void clear();
 
 protected:
   friend class ATTClass;
diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
@@ -149,6 +149,7 @@ void GATTClass::addService(BLELocalService* service)
 {
   service->retain();
   _attributes.add(service);
+  _services.add(service);
 
   uint16_t startHandle = attributeCount();
 
@@ -160,6 +161,7 @@ void GATTClass::addService(BLELocalService* service)
     characteristic->setHandle(attributeCount());
     
     // add the characteristic again to make space of the characteristic value handle
+    characteristic->retain();
     _attributes.add(characteristic);
 
     for (unsigned int j = 0; j < characteristic->descriptorCount(); j++) {
@@ -183,8 +185,13 @@ void GATTClass::clearAttributes()
       delete a;
     }
   }
-
   _attributes.clear();
+
+  for (unsigned int i = 0; i < _services.size(); i++) {
+    _services.get(i)->clear();
+  }
+  _services.clear();
+
 }
 
 #if !defined(FAKE_GATT)
diff --git a/src/utility/GATT.h b/src/utility/GATT.h
@@ -59,6 +59,7 @@ class GATTClass {
 
 private:
   BLELinkedList<BLELocalAttribute*> _attributes;
+  BLELinkedList<BLELocalService*>   _services;
 
   BLELocalService*              _genericAccessService;
   BLELocalCharacteristic*       _deviceNameCharacteristic;

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,13 @@ BLEService::BLEService(const BLEService& other)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
	`66`	`+void BLEService::clear()`
	`67`	`+{`
	`68`	`+ if (_local) {`
	`69`	`+ _local->clear();`
	`70`	`+ }`
	`71`	`+}`
	`72`	`+`
`66`	`73`	`BLEService::~BLEService()`
`67`	`74`	`{`
`68`	`75`	`if (_local && _local->release() == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ int BLELocalAttribute::retain()`
`56`	`56`	`return _refCount;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+bool BLELocalAttribute::active()`
	`60`	`+{`
	`61`	`+ return _refCount > 0;`
	`62`	`+}`
	`63`	`+`
`59`	`64`	`int BLELocalAttribute::release()`
`60`	`65`	`{`
`61`	`66`	`_refCount--;`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permis`
`46`	`46`	`if (permissions & (BLENotify \| BLEIndicate)) {`
`47`	`47`	`BLELocalDescriptor* cccd = new BLELocalDescriptor("2902", (uint8_t*)&_cccdValue, sizeof(_cccdValue));`
`48`	`48`
	`49`	`+ cccd->retain();`
`49`	`50`	`_descriptors.add(cccd);`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@ BLELocalService::BLELocalService(const char* uuid) :`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
	`31`	`+void BLELocalService::clear() {`
	`32`	`+ _characteristics.clear();`
	`33`	`+ _startHandle = 0;`
	`34`	`+ _endHandle = 0;`
	`35`	`+}`
	`36`	`+`
`31`	`37`	`BLELocalService::~BLELocalService()`
`32`	`38`	`{`
`33`	`39`	`for (unsigned int i = 0; i < characteristicCount(); i++) {`
`@@ -37,8 +43,7 @@ BLELocalService::~BLELocalService()`
`37`	`43`	`delete c;`
`38`	`44`	`}`
`39`	`45`	`}`
`40`		`-`
`41`		`- _characteristics.clear();`
	`46`	`+ clear();`
`42`	`47`	`}`
`43`	`48`
`44`	`49`	`enum BLEAttributeType BLELocalService::type() const`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ void GATTClass::addService(BLELocalService* service)`
`149`	`149`	`{`
`150`	`150`	`service->retain();`
`151`	`151`	`_attributes.add(service);`
	`152`	`+ _services.add(service);`
`152`	`153`
`153`	`154`	`uint16_t startHandle = attributeCount();`
`154`	`155`
`@@ -160,6 +161,7 @@ void GATTClass::addService(BLELocalService* service)`
`160`	`161`	`characteristic->setHandle(attributeCount());`
`161`	`162`
`162`	`163`	`// add the characteristic again to make space of the characteristic value handle`
	`164`	`+ characteristic->retain();`
`163`	`165`	`_attributes.add(characteristic);`
`164`	`166`
`165`	`167`	`for (unsigned int j = 0; j < characteristic->descriptorCount(); j++) {`
`@@ -183,8 +185,13 @@ void GATTClass::clearAttributes()`
`183`	`185`	`delete a;`
`184`	`186`	`}`
`185`	`187`	`}`
`186`		`-`
`187`	`188`	`_attributes.clear();`
	`189`	`+`
	`190`	`+ for (unsigned int i = 0; i < _services.size(); i++) {`
	`191`	`+ _services.get(i)->clear();`
	`192`	`+ }`
	`193`	`+ _services.clear();`
	`194`	`+`
`188`	`195`	`}`
`189`	`196`
`190`	`197`	`#if !defined(FAKE_GATT)`