feat: Switch malloc to calloc

libgdx · Jan 5, 2025 · b53e540 · b53e540
1 parent 5be3776
commit b53e540
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/gdx-jnigen-runtime/src/main/java/com/badlogic/gdx/jnigen/runtime/CHandler.java b/gdx-jnigen-runtime/src/main/java/com/badlogic/gdx/jnigen/runtime/CHandler.java
@@ -208,6 +208,8 @@ public static void deregisterFunctionPointer(long fnPtr) {
 
     public static native long malloc(long size);
 
+    public static native long calloc(long count, long size);
+
     public static native void free(long pointer);
 
     public static native void memcpy(long dst, long src, long size);

diff --git a/gdx-jnigen-runtime/src/main/java/com/badlogic/gdx/jnigen/runtime/pointer/Pointing.java b/gdx-jnigen-runtime/src/main/java/com/badlogic/gdx/jnigen/runtime/pointer/Pointing.java
@@ -21,7 +21,7 @@ public Pointing(long pointer, boolean freeOnGC) {
     }
 
     public Pointing(int size, boolean freeOnGC, boolean guard) {
-        this(CHandler.malloc(size), freeOnGC);
+        this(CHandler.calloc(1, size), freeOnGC);
         if (guard)
             guardBytes(size);
     }

diff --git a/gdx-jnigen-runtime/src/main/native/CHandler.cpp b/gdx-jnigen-runtime/src/main/native/CHandler.cpp
@@ -401,6 +401,10 @@ JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_jnigen_runtime_CHandler_malloc(JNI
     return reinterpret_cast<jlong>(malloc(size));
 }
 
+JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_jnigen_runtime_CHandler_calloc(JNIEnv* env, jclass clazz, jlong count, jlong size) {
+    return reinterpret_cast<jlong>(calloc(count, size));
+}
+
 JNIEXPORT void JNICALL Java_com_badlogic_gdx_jnigen_runtime_CHandler_free(JNIEnv* env, jclass clazz, jlong pointer) {
     free((void*)pointer);
 }

diff --git a/gdx-jnigen-runtime/src/main/native/CHandler.h b/gdx-jnigen-runtime/src/main/native/CHandler.h