Ensure propagation of handle invalidation of native library on manual unload

matthiasblaesing · matthiasblaesing · commit 7775be31464d · 2023-12-04T21:49:18.000+01:00
Reported by: @sebbASF Closes: #1561
diff --git a/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java
@@ -95,8 +95,8 @@ public long getSymbolAddress(long handle, String name, SymbolProvider parent) {
         }
     };
 
-    private Cleaner.Cleanable cleanable;
-    private long handle;
+    private final Cleaner.Cleanable cleanable;
+    private volatile long handle;
     private final String libraryName;
     private final String libraryPath;
     private final Map<String, Function> functions = new HashMap<>();
@@ -701,8 +701,8 @@ public void close() {
 
         synchronized(this) {
             if (handle != 0) {
-                cleanable.clean();
                 handle = 0;
+                cleanable.clean();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ public long getSymbolAddress(long handle, String name, SymbolProvider parent) {`
`95`	`95`	`}`
`96`	`96`	`};`
`97`	`97`
`98`		`- private Cleaner.Cleanable cleanable;`
`99`		`- private long handle;`
	`98`	`+ private final Cleaner.Cleanable cleanable;`
	`99`	`+ private volatile long handle;`
`100`	`100`	`private final String libraryName;`
`101`	`101`	`private final String libraryPath;`
`102`	`102`	`private final Map<String, Function> functions = new HashMap<>();`
`@@ -701,8 +701,8 @@ public void close() {`
`701`	`701`
`702`	`702`	`synchronized(this) {`
`703`	`703`	`if (handle != 0) {`
`704`		`- cleanable.clean();`
`705`	`704`	`handle = 0;`
	`705`	`+ cleanable.clean();`
`706`	`706`	`}`
`707`	`707`	`}`
`708`	`708`	`}`