DiskIO (Windows): fix segfault and memleak

fastfetch-cli · Dec 17, 2023 · 4e4246a · 4e4246a
1 parent c3a2806
commit 4e4246a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/detection/diskio/diskio.h b/src/detection/diskio/diskio.h
@@ -14,10 +14,10 @@ typedef struct FFDiskIOResult
     FFstrbuf name;
     FFstrbuf interconnect;
     FFstrbuf serial;
+    FFstrbuf devPath;
     FFDiskIOPhysicalType type;
     uint64_t size;
     bool removable;
-    FFstrbuf devPath;
     uint64_t bytesRead;
     uint64_t readCount;
     uint64_t bytesWritten;

diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c
@@ -82,6 +82,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
             continue;
         }
 
+        ffStrbufInitWS(&device->devPath, szDevice);
         ffStrbufInit(&device->serial);
         if (sdd->SerialNumberOffset != 0)
         {

diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
@@ -114,6 +114,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
         ffStrbufDestroy(&dev->name);
         ffStrbufDestroy(&dev->interconnect);
         ffStrbufDestroy(&dev->devPath);
+        ffStrbufDestroy(&dev->serial);
     }
 }