Use try/finally when cleaning up multiple resources in case one cleanup fails and throws an exception, the second resource cleanup will still execute.

Author: norrisjeremy

src/main/java/com/jcraft/jsch/PageantConnector.java

@@ -136,10 +136,15 @@ public void query(Buffer buffer) throws AgentProxyException {
             "SendMessage() returned 0 with cds.dwData: " + Long.toHexString(foo));
       }
     } finally {
-      if (sharedMemory != null)
-        kernel32.UnmapViewOfFile(sharedMemory);
-      if (sharedFile != null)
-        kernel32.CloseHandle(sharedFile);
+      try {
+        if (sharedMemory != null) {
+          kernel32.UnmapViewOfFile(sharedMemory);
+        }
+      } finally {
+        if (sharedFile != null) {
+          kernel32.CloseHandle(sharedFile);
+        }
+      }
     }
   }
 

src/main/java23/com/jcraft/jsch/PageantFFMConnector.java

@@ -203,10 +203,15 @@ public void query(Buffer buffer) throws AgentProxyException {
               "SendMessage() returned 0 with cds.dwData: " + Long.toHexString(foo));
         }
       } finally {
-        if (!sharedMemory.equals(MemorySegment.NULL))
-          UnmapViewOfFile(errorState, mmva);
-        if (!sharedFile.equals(MemorySegment.NULL))
-          CloseHandle(errorState, sharedFile);
+        try {
+          if (!sharedMemory.equals(MemorySegment.NULL)) {
+            UnmapViewOfFile(errorState, mmva);
+          }
+        } finally {
+          if (!sharedFile.equals(MemorySegment.NULL)) {
+            CloseHandle(errorState, sharedFile);
+          }
+        }
       }
     }
   }
@@ -271,11 +276,14 @@ private MemorySegment getUserSid(Arena arena, MemorySegment errorState)
 
       return usersid;
     } finally {
-      if (!tok.equals(MemorySegment.NULL)) {
-        CloseHandle(errorState, tok);
-      }
-      if (!proc.equals(MemorySegment.NULL)) {
-        CloseHandle(errorState, proc);
+      try {
+        if (!tok.equals(MemorySegment.NULL)) {
+          CloseHandle(errorState, tok);
+        }
+      } finally {
+        if (!proc.equals(MemorySegment.NULL)) {
+          CloseHandle(errorState, proc);
+        }
       }
     }
   }