Fix memory freeing issue on Windows

louist103 · Nov 22, 2024 · 56ff59f · 56ff59f
1 parent 3e181b7
commit 56ff59f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/utils/filebox.h b/utils/filebox.h
@@ -67,7 +67,7 @@ static void FillFileQueue(T& dest, char* mBasePath, ExtCheckCallback cb) {
                 size_t s2 = strlen(mBasePath);
                 size_t sizeToAlloc = s1 + s2 + 2;
 
-                char* fullPath = (char*)operator new(sizeToAlloc, std::align_val_t(2));
+                char* fullPath = (char*)operator new[](sizeToAlloc, std::align_val_t(2));
                 snprintf(fullPath, sizeToAlloc, "%s\\%s", mBasePath, ffd.cFileName);
                 dest.push_back(fullPath);
             }

diff --git a/windows/CustomStreamedAudio.cpp b/windows/CustomStreamedAudio.cpp
@@ -38,8 +38,8 @@ CustomStreamedAudioWindow::CustomStreamedAudioWindow() {
 static void ClearFileQueue(std::vector<char*>* fileQueue) {
     for (auto f : *fileQueue) {
         // The lowest bit of the path is set to 1 if the file has been processed. We need to undo that to delete it.
-        uintptr_t origPtr = (uintptr_t)f & (UINTPTR_MAX & (~1));
-        operator delete[]((char*)(origPtr));
+        uintptr_t origPtr = (uintptr_t)f & (UINTPTR_MAX & (~(uintptr_t)1));
+        operator delete[]((void*)origPtr, std::align_val_t(2));
     }
     fileQueue->clear();
 }