Fix handle leak in GetFinalPathName

tyrielv · tyrielv · commit 9c4cce827ff5 · 2026-05-19T13:35:19.000-07:00
The fileHandle obtained from CreateFileW was never closed after
calling GetFinalPathNameByHandleW, leaking a kernel handle on
every invocation. Add CloseHandle(fileHandle) on both the success
path and the error path before die().

Assisted-by: Claude Opus 4.6
Signed-off-by: Tyrie Vella &lt;tyrielv@gmail.com&gt;
diff --git a/GVFS/GVFS.NativeHooks.Common/common.windows.cpp b/GVFS/GVFS.NativeHooks.Common/common.windows.cpp
@@ -30,9 +30,12 @@ PATH_STRING GetFinalPathName(const PATH_STRING& path)
     DWORD finalPathSize = GetFinalPathNameByHandleW(fileHandle, finalPathByHandle, MAX_PATH, FILE_NAME_NORMALIZED);
     if (finalPathSize == 0)
     {
+        CloseHandle(fileHandle);
         die(ReturnCode::PathNameError, "Could not get final path name by handle for %ls, Error: %d\n", path.c_str(), GetLastError());
     }
 
+    CloseHandle(fileHandle);
+
     std::wstring finalPath(finalPathByHandle);
 
     // The remarks section of GetFinalPathNameByHandle mentions the return being prefixed with "\\?\" or "\\?\UNC\"

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,12 @@ PATH_STRING GetFinalPathName(const PATH_STRING& path)`
`30`	`30`	`DWORD finalPathSize = GetFinalPathNameByHandleW(fileHandle, finalPathByHandle, MAX_PATH, FILE_NAME_NORMALIZED);`
`31`	`31`	`if (finalPathSize == 0)`
`32`	`32`	`{`
	`33`	`+ CloseHandle(fileHandle);`
`33`	`34`	`die(ReturnCode::PathNameError, "Could not get final path name by handle for %ls, Error: %d\n", path.c_str(), GetLastError());`
`34`	`35`	`}`
`35`	`36`
	`37`	`+ CloseHandle(fileHandle);`
	`38`	`+`
`36`	`39`	`std::wstring finalPath(finalPathByHandle);`
`37`	`40`
`38`	`41`	`// The remarks section of GetFinalPathNameByHandle mentions the return being prefixed with "\\?\" or "\\?\UNC\"`