Merge tag '5.12.1' into master-loongarch64-port

CHANGES.md

@@ -2,6 +2,13 @@ NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL 2.0 (see LICENSE
 
 NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.
 
+Release 5.12.1
+==============
+
+Bug Fixes
+---------
+* [#1447](https://github.com/java-native-access/jna/issues/1447): Null-check cleanable in `c.s.j.Memory#close` - [@dbwiddis](https://github.com/dbwiddis).
+
 Release 5.12.0
 ==============
 

README.md

@@ -7,7 +7,7 @@
 Java Native Access (JNA)
 ========================
 
-The definitive JNA reference (including an overview and usage details) is in the [JavaDoc](http://java-native-access.github.io/jna/5.12.0/javadoc/).  Please read the [overview](http://java-native-access.github.io/jna/5.12.0/javadoc/overview-summary.html#overview_description).  Questions, comments, or exploratory conversations should begin on the [mailing list](http://groups.google.com/group/jna-users), although you may find it easier to find answers to already-solved problems on [StackOverflow](http://stackoverflow.com/questions/tagged/jna).
+The definitive JNA reference (including an overview and usage details) is in the [JavaDoc](http://java-native-access.github.io/jna/5.12.1/javadoc/).  Please read the [overview](http://java-native-access.github.io/jna/5.12.1/javadoc/overview-summary.html#overview_description).  Questions, comments, or exploratory conversations should begin on the [mailing list](http://groups.google.com/group/jna-users), although you may find it easier to find answers to already-solved problems on [StackOverflow](http://stackoverflow.com/questions/tagged/jna).
 
 JNA provides Java programs easy access to native shared libraries without writing anything but Java code - no JNI or native code is required. This functionality is comparable to Windows' Platform/Invoke and Python's ctypes.
 
@@ -65,20 +65,20 @@ Pre-built platform support may be found [here](https://github.com/java-native-ac
 Download
 ========
 
-Version 5.12.0
+Version 5.12.1
 
 JNA
 ---
 
-[![Maven Central](https://img.shields.io/maven-central/v/net.java.dev.jna/jna.svg?label=Maven%20Central)](https://search.maven.org/artifact/net.java.dev.jna/jna/5.12.0/jar) [jna-5.12.0.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.12.0/jna-5.12.0.jar) [jna-jpms-5.12.0.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-jpms/5.12.0/jna-jpms-5.12.0.jar)
+[![Maven Central](https://img.shields.io/maven-central/v/net.java.dev.jna/jna.svg?label=Maven%20Central)](https://search.maven.org/artifact/net.java.dev.jna/jna/5.12.1/jar) [jna-5.12.1.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar) [jna-jpms-5.12.1.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-jpms/5.12.1/jna-jpms-5.12.1.jar)
 
 This is the core artifact of JNA and contains only the binding library and the
 core helper classes.
 
 JNA Platform
 ------------
 
-[![Maven Central](https://img.shields.io/maven-central/v/net.java.dev.jna/jna-platform.svg?label=Maven%20Central)](https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.12.0/jar) [jna-platform-5.12.0.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.12.0/jna-platform-5.12.0.jar) [jna-platform-jpms-5.12.0.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform-jpms/5.12.0/jna-platform-jpms-5.12.0.jar)
+[![Maven Central](https://img.shields.io/maven-central/v/net.java.dev.jna/jna-platform.svg?label=Maven%20Central)](https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.12.1/jar) [jna-platform-5.12.1.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.12.1/jna-platform-5.12.1.jar) [jna-platform-jpms-5.12.1.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform-jpms/5.12.1/jna-platform-jpms-5.12.1.jar)
 
 This artifact holds cross-platform mappings and mappings for a number of commonly used platform
 functions, including a large number of Win32 mappings as well as a set of utility classes
@@ -146,12 +146,12 @@ Using the Library
 * [Platform Library](https://github.com/java-native-access/jna/blob/master/www/PlatformLibrary.md)
 * [Direct Method Mapping](https://github.com/java-native-access/jna/blob/master/www/DirectMapping.md) (Optimization)
 * [Frequently Asked Questions (FAQ)](https://github.com/java-native-access/jna/blob/master/www/FrequentlyAskedQuestions.md)
-* [Avoiding Crashes](http://java-native-access.github.io/jna/5.12.0/javadoc/overview-summary.html#crash-protection)
+* [Avoiding Crashes](http://java-native-access.github.io/jna/5.12.1/javadoc/overview-summary.html#crash-protection)
 
 Primary Documentation (JavaDoc)
 ===============================
 
-The definitive JNA reference is in the [JavaDoc](http://java-native-access.github.io/jna/5.12.0/javadoc/).
+The definitive JNA reference is in the [JavaDoc](http://java-native-access.github.io/jna/5.12.1/javadoc/).
 
 Developers
 ==========

build.xml

@@ -64,7 +64,7 @@
   <!-- JNA library release version - android versionCode is derived from mjar/minor/revision -->
   <property name="jna.major" value="5"/>
   <property name="jna.minor" value="12"/>
-  <property name="jna.revision" value="0"/>
+  <property name="jna.revision" value="1"/>
   <property name="jna.build" value="0"/> <!--${build.number}-->
   <condition property="version.suffix" value="" else="-SNAPSHOT">
     <or>

src/com/sun/jna/Memory.java

@@ -22,7 +22,6 @@
  */
 package com.sun.jna;
 
-import com.sun.jna.internal.Cleaner;
 import java.io.Closeable;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -32,6 +31,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.sun.jna.internal.Cleaner;
+
 /**
  * A <code>Pointer</code> to memory obtained from the native heap via a
  * call to <code>malloc</code>.
@@ -76,7 +77,7 @@ public static void disposeAll() {
         }
     }
 
-    private Cleaner.Cleanable cleanable;
+    private final Cleaner.Cleanable cleanable;
     protected long size; // Size of the malloc'ed space
 
     /** Provide a view into the original memory.  Keeps an implicit reference
@@ -123,6 +124,7 @@ public Memory(long size) {
 
     protected Memory() {
         super();
+        cleanable = null;
     }
 
     /** Provide a view of this memory using the given offset as the base address.  The
@@ -180,9 +182,12 @@ public Memory align(int byteBoundary) {
     }
 
     /** Free the native memory and set peer to zero */
+    @Override
     public void close() {
         peer = 0;
-        cleanable.clean();
+        if (cleanable != null) {
+            cleanable.clean();
+        }
     }
 
     @Deprecated
@@ -783,6 +788,7 @@ public MemoryDisposer(long peer) {
             this.peer = peer;
         }
 
+        @Override
         public synchronized void run() {
             try {
                 free(peer);