Merge pull request #1043 from matthiasblaesing/github-1042

[GITHUB-1042] c.s.j.p.WindowUtils.W32WindowUtils.getProcessFilePath does not close process handle
java-native-access · Dec 10, 2018 · 365f6b3 · 365f6b3
2 parents bc22845 + 2933a8b
commit 365f6b3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -15,6 +15,7 @@ Bug Fixes
 * [#1036](https://github.com/java-native-access/jna/issues/1036): `Advapi32Util.registryValueExists` called on non existing key raises exception instead of returning `false` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#384](https://github.com/java-native-access/jna/issues/384): Android only supports loading libraries through the JVM `System#loadLibrary` mechanism, defaulting `jna.nosys` to `true` disabled that code path - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#1041](https://github.com/java-native-access/jna/pull/1041): Avoid IllegalArgumentException when reading xattrs with zero length - [@jrobhoward](https://github.com/jrobhoward).
+* [#1042](https://github.com/java-native-access/jna/issues/1042): `com.sun.jna.platform.WindowUtils.W32WindowUtils.getProcessFilePath(HWND)` does not close process handle - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 5.1.0
 =============

diff --git a/contrib/platform/src/com/sun/jna/platform/WindowUtils.java b/contrib/platform/src/com/sun/jna/platform/WindowUtils.java
@@ -1285,17 +1285,30 @@ public String getProcessFilePath(final HWND hwnd) {
 
  final HANDLE process = Kernel32.INSTANCE.OpenProcess(WinNT.PROCESS_QUERY_INFORMATION | WinNT.PROCESS_VM_READ,
  false, pid.getValue());
- if (process == null
- && Kernel32.INSTANCE.GetLastError() != WinNT.ERROR_ACCESS_DENIED) {
- throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+ if (process == null) {
+ if(Kernel32.INSTANCE.GetLastError() != WinNT.ERROR_ACCESS_DENIED) {
+ throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+ } else {
+ // Ignore windows, that can't be accessed
+ return "";
+ }
  }
- final int length = Psapi.INSTANCE.GetModuleFileNameExW(process,
- null, filePath, filePath.length);
- if (length == 0
- && Kernel32.INSTANCE.GetLastError() != WinNT.ERROR_INVALID_HANDLE) {
- throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+
+ try {
+ final int length = Psapi.INSTANCE.GetModuleFileNameExW(process,
+ null, filePath, filePath.length);
+ if (length == 0) {
+ if(Kernel32.INSTANCE.GetLastError() != WinNT.ERROR_INVALID_HANDLE) {
+ throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+ } else {
+ // ignore invalid handles
+ return "";
+ }
+ }
+ return Native.toString(filePath).trim();
+ } finally {
+ Kernel32.INSTANCE.CloseHandle(process);
  }
- return Native.toString(filePath).trim();
  }
 
  @Override

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/WindowUtilsTest.java b/contrib/platform/test/com/sun/jna/platform/win32/WindowUtilsTest.java
@@ -22,14 +22,12 @@
 
 import com.sun.jna.platform.WindowUtils;
 import com.sun.jna.platform.DesktopWindow;
-import com.sun.jna.platform.win32.User32;
 import com.sun.jna.platform.win32.WinDef.DWORDByReference;
 import com.sun.jna.platform.win32.WinDef.HICON;
 import com.sun.jna.platform.win32.WinDef.HWND;
 import com.sun.jna.platform.win32.WinDef.LPARAM;
 import com.sun.jna.platform.win32.WinDef.LRESULT;
 import com.sun.jna.platform.win32.WinDef.WPARAM;
-import com.sun.jna.platform.win32.WinUser;
 
 public class WindowUtilsTest extends TestCase {