diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-13 21:55:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-13 21:55:52 +0100 |
| commit | 7015027cbf6ee071198267b6f4ffc3f4e40dfdd5 (patch) | |
| tree | ee57d4cc0caa3fb4dfca2f1a76d69de8b2070d9e /platform/android | |
| parent | 0e3aae00d88848f9e840f940959f2ecd05ed7a8a (diff) | |
| parent | 838e7d0a8d49ac5d2d149acf7afc6b909f640485 (diff) | |
Merge pull request #46900 from Ev1lbl0w/bugfix-malloc_calls
Replace malloc's with Godot's memalloc macro
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index bb22162879..ae88c2c1be 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -127,9 +127,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jc if (p_cmdline) { cmdlen = env->GetArrayLength(p_cmdline); if (cmdlen) { - cmdline = (const char **)malloc((cmdlen + 1) * sizeof(const char *)); + cmdline = (const char **)memalloc((cmdlen + 1) * sizeof(const char *)); + ERR_FAIL_NULL_MSG(cmdline, "Out of memory."); cmdline[cmdlen] = nullptr; - j_cmdline = (jstring *)malloc(cmdlen * sizeof(jstring)); + j_cmdline = (jstring *)memalloc(cmdlen * sizeof(jstring)); + ERR_FAIL_NULL_MSG(j_cmdline, "Out of memory."); for (int i = 0; i < cmdlen; i++) { jstring string = (jstring)env->GetObjectArrayElement(p_cmdline, i); @@ -147,9 +149,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jc for (int i = 0; i < cmdlen; ++i) { env->ReleaseStringUTFChars(j_cmdline[i], cmdline[i]); } - free(j_cmdline); + memfree(j_cmdline); } - free(cmdline); + memfree(cmdline); } if (err != OK) { |