Changeset 2332 for trunk/eraser

Timestamp:

10/30/2011 1:17:46 AM (19 months ago)

Author:

lowjoel

Message:

Behaviour change: DuplicateHandle? when not provided a handle pointer to clone the source handle to will leak handles from Windows 7 onwards. Prevent that (and restore locked file erasure functionality)

File:

• trunk/eraser/Eraser.Util.Native/OpenHandle.cpp (modified) (1 diff)

trunk/eraser/Eraser.Util.Native/OpenHandle.cpp

@@ -94 +94 @@
     {
         //Open a handle to the owning process
-        HANDLE processHandle = OpenProcess(PROCESS_DUP_HANDLE, false, processId);
+        HANDLE processHandle = OpenProcess(PROCESS_DUP_HANDLE, false, ProcessId);
 
         //Forcibly close the handle
+        HANDLE duplicateHandle = NULL;
         DuplicateHandle(processHandle, static_cast<void*>(Handle), GetCurrentProcess(),
-            NULL, 0, false, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+            &duplicateHandle, 0, false, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+        CloseHandle(duplicateHandle);
 
         //Check if the handle is closed
         bool result = true;
-        HANDLE duplicateHandle = NULL;
         if (DuplicateHandle(processHandle, static_cast<void*>(Handle), GetCurrentProcess(),
             &duplicateHandle, 0, false, DUPLICATE_SAME_ACCESS))