Merge pull request #15401 from IVOES/fix-virtual-call-in-constructor

Avoid calling virtual functions from constructors and destructors
ARMmbed · Apr 26, 2023 · 9a82ad6 · 9a82ad6
2 parents d0ca14e + 4c3928e
commit 9a82ad6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/connectivity/netsocket/source/TLSSocketWrapper.cpp b/connectivity/netsocket/source/TLSSocketWrapper.cpp
@@ -77,7 +77,7 @@ TLSSocketWrapper::TLSSocketWrapper(Socket *transport, const char *hostname, cont
 TLSSocketWrapper::~TLSSocketWrapper()
 {
     if (_transport) {
-        close();
+        TLSSocketWrapper::close();
     }
     mbedtls_entropy_free(&_entropy);
 

diff --git a/drivers/source/CAN.cpp b/drivers/source/CAN.cpp
@@ -138,7 +138,7 @@ int CAN::filter(unsigned int id, unsigned int mask, CANFormat format, int handle
 
 void CAN::attach(Callback<void()> func, IrqType type)
 {
-    lock();
+    CAN::lock();
     if (func) {
         // lock deep sleep only the first time
         if (!_irq[(CanIrqType)type]) {
@@ -154,7 +154,7 @@ void CAN::attach(Callback<void()> func, IrqType type)
         _irq[(CanIrqType)type] = nullptr;
         can_irq_set(&_can, (CanIrqType)type, 0);
     }
-    unlock();
+    CAN::unlock();
 }
 
 void CAN::_irq_handler(uintptr_t context, CanIrqType type)

diff --git a/drivers/source/SPI.cpp b/drivers/source/SPI.cpp
@@ -148,12 +148,12 @@ void SPI::_do_construct()
 
 SPI::~SPI()
 {
-    lock();
+    SPI::lock();
     /* Make sure a stale pointer isn't left in peripheral's owner field */
     if (_peripheral->owner == this) {
         _peripheral->owner = nullptr;
     }
-    unlock();
+    SPI::unlock();
 }
 
 SPI::spi_peripheral_s *SPI::_lookup(SPI::SPIName name)

diff --git a/storage/filesystem/source/Dir.cpp b/storage/filesystem/source/Dir.cpp
@@ -34,7 +34,7 @@ Dir::Dir(FileSystem *fs, const char *path)
 Dir::~Dir()
 {
     if (_fs) {
-        close();
+        Dir::close();
     }
 }
 

diff --git a/storage/filesystem/source/File.cpp b/storage/filesystem/source/File.cpp
@@ -34,7 +34,7 @@ File::File(FileSystem *fs, const char *path, int flags)
 File::~File()
 {
     if (_fs) {
-        close();
+        File::close();
     }
 }