Harden native buffer allocators against allocation and cleanup failures

Author: riccardobl

jme3-android/src/main/java/com/jme3/util/AndroidNativeBufferAllocator.java

@@ -77,23 +77,27 @@ public void destroyDirectBuffer(Buffer toBeDestroyed) {
     @Override
     public ByteBuffer allocate(int size) {
         ByteBuffer buffer = createDirectByteBuffer(size);
-        if (buffer != null) {
-            long address = directBufferAddress(buffer);
-            if (address != 0L) {
-                DEALLOCATORS.put(address, new Deallocator(buffer, address));
-            }
+        if (buffer == null) {
+            throw new OutOfMemoryError("Could not allocate " + size + " bytes through Android native allocator");
+        }
+        long address = directBufferAddress(buffer);
+        if (address != 0L) {
+            DEALLOCATORS.put(address, new Deallocator(buffer, address));
         }
         return buffer;
     }
 
     private static void freeCollectedBuffers() {
-        try {
-            for (;;) {
+        for (;;) {
+            try {
                 Deallocator deallocator = (Deallocator) REFERENCE_QUEUE.remove();
                 deallocator.freeNow();
+            } catch (InterruptedException exception) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (Throwable throwable) {
+                LOGGER.log(Level.SEVERE, "Error deallocating direct buffer", throwable);
             }
-        } catch (InterruptedException exception) {
-            Thread.currentThread().interrupt();
         }
     }
 

jme3-ios/src/main/java/com/jme3/util/LibJGLIOSNativeBufferAllocator.java

@@ -57,13 +57,16 @@ public ByteBuffer allocate(int size) {
     }
 
     private static void freeCollectedBuffers() {
-        try {
-            for (;;) {
+        for (;;) {
+            try {
                 Deallocator deallocator = (Deallocator) REFERENCE_QUEUE.remove();
                 deallocator.freeNow();
+            } catch (InterruptedException exception) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (Throwable throwable) {
+                LOGGER.log(Level.SEVERE, "Error deallocating direct buffer", throwable);
             }
-        } catch (InterruptedException exception) {
-            Thread.currentThread().interrupt();
         }
     }
 

jme3-lwjgl3/src/main/java/com/jme3/util/LWJGLBufferAllocator.java

@@ -100,13 +100,16 @@ void free() {
      * Free unnecessary LWJGL byte buffers.
      */
     static void freeByteBuffers() {
-        try {
-            for (;;) {
+        for (;;) {
+            try {
                 final Deallocator deallocator = (Deallocator) DUMMY_QUEUE.remove();
                 deallocator.free();
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (final Throwable throwable) {
+                LOGGER.log(Level.SEVERE, "Error deallocating direct buffer", throwable);
             }
-        } catch (final InterruptedException e) {
-            e.printStackTrace();
         }
     }
 
@@ -161,7 +164,7 @@ long getAddress(final Buffer buffer) {
 
     @Override
     public ByteBuffer allocate(final int size) {
-        final Long address = MemoryUtil.nmemCalloc(size, 1);
+        final Long address = MemoryUtil.nmemCallocChecked(size, 1);
         final ByteBuffer byteBuffer = MemoryUtil.memByteBuffer(address, size);
         DEALLOCATORS.put(address, createDeallocator(address, byteBuffer));
         return byteBuffer;

jme3-saferallocator/src/main/java/com/jme3/util/SaferBufferAllocator.java

@@ -200,7 +200,11 @@ public static void alignedFree(long ptr) {
     @Override
     public ByteBuffer allocate(int size) {
         SaferAllocMemoryGuard.beforeAlloc(size);
-        return register(SaferAlloc.calloc(1, size));
+        ByteBuffer buffer = SaferAlloc.calloc(1, size);
+        if (buffer == null) {
+            throw new OutOfMemoryError("Could not allocate " + size + " bytes through SaferAlloc");
+        }
+        return register(buffer);
     }
 
     @Override