Fix BTserial memory leaks (espressif#1801)

copercini · me-no-dev · commit a0f0bd930cfd · 2018-08-27T12:06:23.000+02:00
- Delete queue at end
- Close BT connection before end
- DeInit SPP
diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.cpp b/libraries/BluetoothSerial/src/BluetoothSerial.cpp
@@ -152,6 +152,9 @@ static bool _init_bt(const char *deviceName)
 static bool _stop_bt()
 {
     if (btStarted()){
+        if(_spp_client)
+            esp_spp_disconnect(_spp_client);
+        esp_spp_deinit();
         esp_bluedroid_disable();
         esp_bluedroid_deinit();
         btStop();
@@ -172,6 +175,7 @@ BluetoothSerial::BluetoothSerial()
 BluetoothSerial::~BluetoothSerial(void)
 {
     _stop_bt();
+    vQueueDelete(_spp_queue);
 }
 
 bool BluetoothSerial::begin(String localName)
@@ -262,6 +266,7 @@ void BluetoothSerial::flush()
 void BluetoothSerial::end()
 {
     _stop_bt();
+    vQueueDelete(_spp_queue);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ static bool _init_bt(const char *deviceName)`
`152`	`152`	`static bool _stop_bt()`
`153`	`153`	`{`
`154`	`154`	`if (btStarted()){`
	`155`	`+ if(_spp_client)`
	`156`	`+ esp_spp_disconnect(_spp_client);`
	`157`	`+ esp_spp_deinit();`
`155`	`158`	`esp_bluedroid_disable();`
`156`	`159`	`esp_bluedroid_deinit();`
`157`	`160`	`btStop();`
`@@ -172,6 +175,7 @@ BluetoothSerial::BluetoothSerial()`
`172`	`175`	`BluetoothSerial::~BluetoothSerial(void)`
`173`	`176`	`{`
`174`	`177`	`_stop_bt();`
	`178`	`+ vQueueDelete(_spp_queue);`
`175`	`179`	`}`
`176`	`180`
`177`	`181`	`bool BluetoothSerial::begin(String localName)`
`@@ -262,6 +266,7 @@ void BluetoothSerial::flush()`
`262`	`266`	`void BluetoothSerial::end()`
`263`	`267`	`{`
`264`	`268`	`_stop_bt();`
	`269`	`+ vQueueDelete(_spp_queue);`
`265`	`270`	`}`
`266`	`271`
`267`	`272`	`#endif`