fix IO helper function

buzzer-re · Jul 25, 2023 · 78f357e · 78f357e
1 parent b2b5faa
commit 78f357e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/Shinigami/Ichigo/Unpacker.cpp b/Shinigami/Ichigo/Unpacker.cpp
@@ -137,6 +137,7 @@ LONG WINAPI GenericUnpacker::VEHandler(EXCEPTION_POINTERS* pExceptionPointers)
             ULONG_PTR StartAddress = (ULONG_PTR)pExceptionPointers->ContextRecord->XIP;
             Memory* Mem = GenericUnpacker::cUnpacker.IsBeingMonitored(StartAddress);
             Mem->IP = (ULONG_PTR) pExceptionPointers->ContextRecord->XIP;
+
             if (GenericUnpacker::cUnpacker.Dump(Mem))
             {
                 PipeLogger::Log(L"Saved stage %d as %s ", GenericUnpacker::cUnpacker.StagesPath.size(), GenericUnpacker::cUnpacker.StagesPath.back().c_str());

diff --git a/Shinigami/Ichigo/Utils.cpp b/Shinigami/Ichigo/Utils.cpp
@@ -4,36 +4,28 @@
 
 BOOL Utils::SaveToFile(const wchar_t* filename, Memory* data, BOOL Paginate)
 {
-    HANDLE hFile = CreateFileW(filename, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    HANDLE hFile = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     BOOL success = TRUE;
 
     if (hFile == INVALID_HANDLE_VALUE) {
         return false;
     }
 
     DWORD BytesWritten = 0;
-
-    if (Paginate)
-    {
-        // Write based on the VirtualQuery output
-        MEMORY_BASIC_INFORMATION mbi;
-        DWORD Written = 0;
-        while (Written < data->Size)
-        {
-            VirtualQuery(data->Addr + Written, &mbi, sizeof(mbi));
-            WriteFile(hFile, data->Addr + Written, mbi.RegionSize, &BytesWritten, NULL);
-            Written += BytesWritten;
-        }
-    }
-    else
+    DWORD OldProt;
+    VirtualProtect(data->Addr, data->Size, PAGE_READWRITE, &OldProt);
+    success = WriteFile(hFile, data->Addr, data->Size, &BytesWritten, NULL) && (BytesWritten == data->Size);
+    PipeLogger::Log(L"Written %d bytes of file that has %d bytes\n", BytesWritten, data->Size);
+    if (BytesWritten != data->Size)
     {
-        success = WriteFile(hFile, data->Addr, data->Size, &BytesWritten, NULL) && (BytesWritten == data->Size);
+        PipeLogger::Log(L"Error: %d", GetLastError());
+
     }
+    VirtualProtect(data->Addr, data->Size, OldProt, &OldProt);
 
-
     CloseHandle(hFile);
 
-    return success;
+    return TRUE;
 }