applied and tested fixes from PR#39

Author: cristidragomir97

src/InternalStorage.cpp

@@ -6,21 +6,32 @@ InternalStorage::InternalStorage(){
 
         //Arduino_UnifiedStorage::debugPrint("[InternalStorage][INFO] No partitions found, restoring default partitions");
         restoreDefaultPartitions();
-    } else {
-        int lastPartitionNumber = partitionsAvailable.size();
-        FileSystems lastPartitionFileSystem = partitionsAvailable.back().fileSystemType;
-        //Arduino_UnifiedStorage::debugPrint("[InternalStorage][INFO] Found " + String(lastPartitionNumber) + " partitions, using last partition as internal storage");
-
-        this -> partitionNumber = lastPartitionNumber;
-        this -> fileSystemType = lastPartitionFileSystem;
-        this -> partitionName = (char *)"internal"; 
+        // re-read table
+        partitionsAvailable = Partitioning::readPartitions(QSPIFBlockDeviceType::get_default_instance());
     }
+
+    int lastPartitionNumber = partitionsAvailable.size();
+    FileSystems lastPartitionFileSystem = partitionsAvailable.back().fileSystemType;
+    //Arduino_UnifiedStorage::debugPrint("[InternalStorage][INFO] Found " + String(lastPartitionNumber) + " partitions, using last partition as internal storage");
+
+    this -> partitionNumber = lastPartitionNumber;
+    this -> fileSystemType = lastPartitionFileSystem;
+    this -> partitionName = (char *)"internal";
+    this -> blockDevice = BlockDeviceType::get_default_instance();
+    this -> mbrBlockDevice = new MBRBlockDeviceType(this -> blockDevice, this->partitionNumber);
 }
 
 InternalStorage::InternalStorage(int partition, const char * name, FileSystems fileSystemType){
     this -> partitionNumber = partition;
-    this -> partitionName = (char *)name;
+    this -> partitionName = name;
     this -> fileSystemType = fileSystemType;
+    this -> blockDevice = BlockDeviceType::get_default_instance();
+    this -> mbrBlockDevice = new MBRBlockDeviceType(this -> blockDevice, this->partitionNumber);
+}
+
+InternalStorage::~InternalStorage()
+{
+  delete this -> mbrBlockDevice;
 }
 
 bool InternalStorage::begin(FileSystems fileSystemType){

src/InternalStorage.h

@@ -19,6 +19,9 @@ class InternalStorage : public Arduino_UnifiedStorage {
      * When using the default partitioning scheme the last partition would be the user partition. 
      */
     InternalStorage();
+    
+    ~InternalStorage();
+
 
     /**
      * Constructs an InternalStorage object with the specified partition, name, and file system.
@@ -105,7 +108,7 @@ class InternalStorage : public Arduino_UnifiedStorage {
         MBRBlockDeviceType * mbrBlockDevice;
         FileSystemType * fileSystem;
         int partitionNumber;
-        char * partitionName;        
+        const char * partitionName;        
         FileSystems fileSystemType;
 
 };

src/Partitioning.cpp

@@ -135,7 +135,7 @@ std::vector<Partition> Partitioning::readPartitions(BlockDeviceType * blockDevic
     returnCode = blockDevice->read(buffer, 512 - buffer_size, buffer_size);
     if (returnCode) {
         Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][ERROR] Unable to read the Master Boot Record");
-
+        blockDevice->deinit();
         delete[] buffer;
         return partitions;
     }
@@ -146,6 +146,7 @@ std::vector<Partition> Partitioning::readPartitions(BlockDeviceType * blockDevic
     if (table->signature[0] != mbrMagicNumbers[0] || table->signature[1] != mbrMagicNumbers[1]) {
 
         Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] MBR Not Found - Flash Memory doesn't have partitions.");
+        blockDevice->deinit();
         delete[] buffer;
         return partitions;
     }
@@ -171,24 +172,31 @@ std::vector<Partition> Partitioning::readPartitions(BlockDeviceType * blockDevic
         MBRBlockDeviceType * mbrBlocKDevice = new MBRBlockDeviceType(blockDevice, partitionIndex);
         FATFileSystemType  * fatProbeFileSystem =  new FATFileSystemType("probing");
         LittleFileSystemType * littleFsProbeFilesystem =  new LittleFileSystemType("probing");
-    
-        if(fatProbeFileSystem -> mount(mbrBlocKDevice) == 0){
-            Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is formatted with FAT file system");
-            fatProbeFileSystem -> unmount();
-            partition.fileSystemType = FS_FAT;
-            partitions.push_back(partition);
-            
-        } else if (littleFsProbeFilesystem -> mount(mbrBlocKDevice) == 0){
-            Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is formatted with LittleFS file system");
-            littleFsProbeFilesystem -> unmount();
-            partition.fileSystemType = FS_LITTLEFS;
-            partitions.push_back(partition);
-        } else {
-            Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is not formatted with a recognized file system");
+
+        if(mbrBlocKDevice && fatProbeFileSystem && littleFsProbeFilesystem){     
+            if(fatProbeFileSystem -> mount(mbrBlocKDevice) == 0){
+                Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is formatted with FAT file system");
+                fatProbeFileSystem -> unmount();
+                partition.fileSystemType = FS_FAT;
+                partitions.push_back(partition);
+                
+            } else if (littleFsProbeFilesystem -> mount(mbrBlocKDevice) == 0){
+                Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is formatted with LittleFS file system");
+                littleFsProbeFilesystem -> unmount();
+                partition.fileSystemType = FS_LITTLEFS;
+                partitions.push_back(partition);
+            } else {
+                Arduino_UnifiedStorage::debugPrint("[Partitioning][readPartitions][INFO] Partition " + String(partitionIndex) + " is not formatted with a recognized file system");
+            }
         }
- 
+
+        delete mbrBlocKDevice;
+        delete fatProbeFileSystem;
+        delete littleFsProbeFilesystem;
+
     }
 
+    blockDevice->deinit();
     delete[] buffer;
     return partitions;
 }

src/Utils.h

@@ -56,11 +56,17 @@
 
     // Dynamically allocate memory for the string and copy the generated value
     char* dynamicName = new char[strlen(partitionName) + 1];
-    strcpy(dynamicName, partitionName);
+    if(dynamicName)
+    {
+      strcpy(dynamicName, partitionName);
+    }
 
     return dynamicName;
 }
 
+[[gnu::unused]] static void freePartitionName(const char* partitionName) {
+    delete[] partitionName;
+}
 
 [[gnu::unused]] static bool copyFolder(const char* source, const char* destination) {
   DIR* dir = opendir(source);
@@ -88,7 +94,16 @@
     size_t destinationPathLength = strlen(destination) + strlen(entry->d_name) + 1;
 
     char* sourcePath = new char[sourcePathLength];
+    if(!sourcePath)
+    {
+      return false;
+    }
     char* destinationPath = new char[destinationPathLength];
+    if(!destinationPath)
+    {
+      delete[] sourcePath;
+      return false;
+    }
 
     snprintf(sourcePath, sourcePathLength, "%s/%s", source, entry->d_name);
 
@@ -97,35 +112,35 @@
     struct stat fileInfo;
     if (stat(sourcePath, &fileInfo) != 0) {
       closedir(dir);
-      delete(sourcePath);
-      delete(destinationPath);
+      delete[] sourcePath;
+      delete[] destinationPath;
       return false;
     }
 
     if (S_ISDIR(fileInfo.st_mode)) {
       // Recursively copy subdirectories
       if (!copyFolder(sourcePath, destinationPath)) {
         closedir(dir);
-        delete(sourcePath);
-        delete(destinationPath);
+        delete[] sourcePath;
+        delete[] destinationPath;
         return false;
       }
     } else {
       // Copy regular files
       FILE* sourceFile = fopen(sourcePath, "r");
       if (sourceFile == nullptr) {
         closedir(dir);
-        delete(sourcePath);
-        delete(destinationPath);
+        delete[] sourcePath;
+        delete[] destinationPath;
         return false;
       }
 
       FILE* destinationFile = fopen(destinationPath, "w");
       if (destinationFile == nullptr) {
         fclose(sourceFile);
         closedir(dir);
-        delete(sourcePath);
-        delete(destinationPath);
+        delete[] sourcePath;
+        delete[] destinationPath;
         return false;
       }
 
@@ -137,6 +152,10 @@
       fclose(sourceFile);
       fclose(destinationFile);
     }
+
+    delete[] sourcePath;
+    delete[] destinationPath;
+
   }
 
   closedir(dir);
@@ -215,4 +234,4 @@
 
 
 
-#endif 
+#endif