Merge pull request arduino-libraries#237 from alranel/bugfix/192-leak

facchinm · web-flow · commit 3003f12712b6 · 2022-05-30T14:54:42.000+02:00
Bugfix: memory leak caused by variables not being deleted in end()
diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
@@ -72,11 +72,11 @@ BLECharacteristic::BLECharacteristic(const BLECharacteristic& other)
 
 BLECharacteristic::~BLECharacteristic()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/BLEDescriptor.cpp b/src/BLEDescriptor.cpp
@@ -72,11 +72,11 @@ BLEDescriptor::BLEDescriptor(const BLEDescriptor& other)
 
 BLEDescriptor::~BLEDescriptor()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/BLEService.cpp b/src/BLEService.cpp
@@ -65,11 +65,11 @@ BLEService::BLEService(const BLEService& other)
 
 BLEService::~BLEService()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
@@ -62,7 +62,7 @@ BLELocalCharacteristic::~BLELocalCharacteristic()
   for (unsigned int i = 0; i < descriptorCount(); i++) {
     BLELocalDescriptor* d = descriptor(i);
 
-    if (d->release() <= 0) {
+    if (d->release() == 0) {
       delete d;
     }
   }
diff --git a/src/local/BLELocalService.cpp b/src/local/BLELocalService.cpp
@@ -33,7 +33,7 @@ BLELocalService::~BLELocalService()
   for (unsigned int i = 0; i < characteristicCount(); i++) {
     BLELocalCharacteristic* c = characteristic(i);
 
-    if (c->release() <= 0) {
+    if (c->release() == 0) {
       delete c;
     }
   }
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
@@ -44,7 +44,7 @@ BLERemoteCharacteristic::~BLERemoteCharacteristic()
   for (unsigned int i = 0; i < descriptorCount(); i++) {
     BLERemoteDescriptor* d = descriptor(i);
 
-    if (d->release() <= 0) {
+    if (d->release() == 0) {
       delete d;
     }
   }
diff --git a/src/remote/BLERemoteDevice.cpp b/src/remote/BLERemoteDevice.cpp
@@ -50,7 +50,7 @@ void BLERemoteDevice::clearServices()
   for (unsigned int i = 0; i < serviceCount(); i++) {
     BLERemoteService* s = service(i);
 
-    if (s->release() <= 0) {
+    if (s->release() == 0) {
       delete s;
     }
   }
diff --git a/src/remote/BLERemoteService.cpp b/src/remote/BLERemoteService.cpp
@@ -31,7 +31,7 @@ BLERemoteService::~BLERemoteService()
   for (unsigned int i = 0; i < characteristicCount(); i++) {
     BLERemoteCharacteristic* c = characteristic(i);
 
-    if (c->release() <= 0) {
+    if (c->release() == 0) {
       delete c;
     }
   }
diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
@@ -38,7 +38,7 @@ GATTClass::GATTClass() :
 
 GATTClass::~GATTClass()
 {
-  clearAttributes();
+  end();
 }
 
 void GATTClass::begin()
@@ -70,7 +70,22 @@ void GATTClass::begin()
 
 void GATTClass::end()
 {
-  _attributes.clear();
+  if (_genericAccessService->release() == 0)
+    delete(_genericAccessService);
+  
+  if (_deviceNameCharacteristic->release() == 0)
+    delete(_deviceNameCharacteristic);
+  
+  if (_appearanceCharacteristic->release() == 0)
+    delete(_appearanceCharacteristic);
+  
+  if (_genericAttributeService->release() == 0)
+    delete(_genericAttributeService);
+  
+  if (_servicesChangedCharacteristic->release() == 0)
+    delete(_servicesChangedCharacteristic);
+  
+  clearAttributes();
 }
 
 void GATTClass::setDeviceName(const char* deviceName)
@@ -164,7 +179,7 @@ void GATTClass::clearAttributes()
   for (unsigned int i = 0; i < attributeCount(); i++) {
     BLELocalAttribute* a = attribute(i);
 
-    if (a->release() <= 0) {
+    if (a->release() == 0) {
       delete a;
     }
   }
diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
@@ -234,7 +234,10 @@ void HCICordioTransportClass::end()
     delete bleLoopThread;
     bleLoopThread = NULL;
   }
+
+#if !defined(ARDUINO_PORTENTA_H7_M4) && !defined(ARDUINO_PORTENTA_H7_M7) && !defined(ARDUINO_NICLA_VISION)
   CordioHCIHook::getDriver().terminate();
+#endif
 
   _begun = false;
 }

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ BLECharacteristic::BLECharacteristic(const BLECharacteristic& other)`
`72`	`72`
`73`	`73`	`BLECharacteristic::~BLECharacteristic()`
`74`	`74`	`{`
`75`		`- if (_local && _local->release() <= 0) {`
	`75`	`+ if (_local && _local->release() == 0) {`
`76`	`76`	`delete _local;`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (_remote && _remote->release() <= 0) {`
	`79`	`+ if (_remote && _remote->release() == 0) {`
`80`	`80`	`delete _remote;`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ BLEDescriptor::BLEDescriptor(const BLEDescriptor& other)`
`72`	`72`
`73`	`73`	`BLEDescriptor::~BLEDescriptor()`
`74`	`74`	`{`
`75`		`- if (_local && _local->release() <= 0) {`
	`75`	`+ if (_local && _local->release() == 0) {`
`76`	`76`	`delete _local;`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (_remote && _remote->release() <= 0) {`
	`79`	`+ if (_remote && _remote->release() == 0) {`
`80`	`80`	`delete _remote;`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,11 @@ BLEService::BLEService(const BLEService& other)`
`65`	`65`
`66`	`66`	`BLEService::~BLEService()`
`67`	`67`	`{`
`68`		`- if (_local && _local->release() <= 0) {`
	`68`	`+ if (_local && _local->release() == 0) {`
`69`	`69`	`delete _local;`
`70`	`70`	`}`
`71`	`71`
`72`		`- if (_remote && _remote->release() <= 0) {`
	`72`	`+ if (_remote && _remote->release() == 0) {`
`73`	`73`	`delete _remote;`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ BLELocalCharacteristic::~BLELocalCharacteristic()`
`62`	`62`	`for (unsigned int i = 0; i < descriptorCount(); i++) {`
`63`	`63`	`BLELocalDescriptor* d = descriptor(i);`
`64`	`64`
`65`		`- if (d->release() <= 0) {`
	`65`	`+ if (d->release() == 0) {`
`66`	`66`	`delete d;`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ BLELocalService::~BLELocalService()`
`33`	`33`	`for (unsigned int i = 0; i < characteristicCount(); i++) {`
`34`	`34`	`BLELocalCharacteristic* c = characteristic(i);`
`35`	`35`
`36`		`- if (c->release() <= 0) {`
	`36`	`+ if (c->release() == 0) {`
`37`	`37`	`delete c;`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ BLERemoteCharacteristic::~BLERemoteCharacteristic()`
`44`	`44`	`for (unsigned int i = 0; i < descriptorCount(); i++) {`
`45`	`45`	`BLERemoteDescriptor* d = descriptor(i);`
`46`	`46`
`47`		`- if (d->release() <= 0) {`
	`47`	`+ if (d->release() == 0) {`
`48`	`48`	`delete d;`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void BLERemoteDevice::clearServices()`
`50`	`50`	`for (unsigned int i = 0; i < serviceCount(); i++) {`
`51`	`51`	`BLERemoteService* s = service(i);`
`52`	`52`
`53`		`- if (s->release() <= 0) {`
	`53`	`+ if (s->release() == 0) {`
`54`	`54`	`delete s;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ BLERemoteService::~BLERemoteService()`
`31`	`31`	`for (unsigned int i = 0; i < characteristicCount(); i++) {`
`32`	`32`	`BLERemoteCharacteristic* c = characteristic(i);`
`33`	`33`
`34`		`- if (c->release() <= 0) {`
	`34`	`+ if (c->release() == 0) {`
`35`	`35`	`delete c;`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,10 @@ void HCICordioTransportClass::end()`
`234`	`234`	`delete bleLoopThread;`
`235`	`235`	`bleLoopThread = NULL;`
`236`	`236`	`}`
	`237`	`+`
	`238`	`+#if !defined(ARDUINO_PORTENTA_H7_M4) && !defined(ARDUINO_PORTENTA_H7_M7) && !defined(ARDUINO_NICLA_VISION)`
`237`	`239`	`CordioHCIHook::getDriver().terminate();`
	`240`	`+#endif`
`238`	`241`
`239`	`242`	`_begun = false;`
`240`	`243`	`}`