fix(Wire): avoid memory leaks

add destructor to call end(). Fixes #2142 Signed-off-by: Frederic Pillon <[email protected]>
stm32duino · Oct 19, 2023 · ff1731f · ff1731f
1 parent 471a0ea
commit ff1731f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
@@ -45,6 +45,15 @@ TwoWire::TwoWire(uint32_t sda, uint32_t scl)
   _i2c.scl = digitalPinToPinName(scl);
 }
 
+/**
+  * @brief  TwoWire destructor
+  * @retval None
+  */
+TwoWire::~TwoWire()
+{
+  end();
+}
+
 // Public Methods //////////////////////////////////////////////////////////////
 
 void TwoWire::begin(uint32_t sda, uint32_t scl)
@@ -106,11 +115,15 @@ void TwoWire::begin(int address, bool generalCall, bool NoStretchMode)
 void TwoWire::end(void)
 {
   i2c_deinit(&_i2c);
-  free(txBuffer);
-  txBuffer = nullptr;
+  if (txBuffer != nullptr) {
+    free(txBuffer);
+    txBuffer = nullptr;
+  }
   txBufferAllocated = 0;
-  free(rxBuffer);
-  rxBuffer = nullptr;
+  if (rxBuffer != nullptr) {
+    free(rxBuffer);
+    rxBuffer = nullptr;
+  }
   rxBufferAllocated = 0;
 }
 

diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
@@ -78,6 +78,7 @@ class TwoWire : public Stream {
   public:
     TwoWire();
     TwoWire(uint32_t sda, uint32_t scl);
+    ~TwoWire();
     // setSCL/SDA have to be called before begin()
     void setSCL(uint32_t scl)
     {