godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Android: Fix memory issues in _variant_to_jvalue()

Browse Source
This commit is contained in:
David Snopek
2025-11-25 13:32:07 -06:00
parent 9dd6c4dbac
commit c2f8d1a29b
7 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/java/app/src/instrumented/assets/test/base_test.gd
View File

@@ -42,3 +42,10 @@ func assert_equal(actual, expected):
else: else:
__assert_fail() __assert_fail()
print (" |-> Expected '%s' but got '%s'" % [expected, actual]) print (" |-> Expected '%s' but got '%s'" % [expected, actual])
func assert_true(value):
if value:
__assert_pass()
else:
__assert_fail()
print (" |-> Expected '%s' to be truthy" % value)

13
platform/android/java/app/src/instrumented/assets/test/javaclasswrapper/java_class_wrapper_tests.gd
View File

@@ -18,6 +18,8 @@ func run_tests():
__exec_test(test_big_integers) __exec_test(test_big_integers)
__exec_test(test_callable)
print("JavaClassWrapper tests finished.") print("JavaClassWrapper tests finished.")
print("Tests started: " + str(_test_started)) print("Tests started: " + str(_test_started))
print("Tests completed: " + str(_test_completed)) print("Tests completed: " + str(_test_completed))
@@ -142,3 +144,14 @@ func test_big_integers():
assert_equal(TestClass.testArgLong(4242424242), "4242424242") assert_equal(TestClass.testArgLong(4242424242), "4242424242")
assert_equal(TestClass.testArgLong(-4242424242), "-4242424242") assert_equal(TestClass.testArgLong(-4242424242), "-4242424242")
assert_equal(TestClass.testDictionary({a = 4242424242, b = -4242424242}), "{a=4242424242, b=-4242424242}") assert_equal(TestClass.testDictionary({a = 4242424242, b = -4242424242}), "{a=4242424242, b=-4242424242}")
func test_callable():
var android_runtime = Engine.get_singleton("AndroidRuntime")
assert_true(android_runtime != null)
var cb1_data := {called = false}
var cb1 = func():
cb1_data['called'] = true
return null
android_runtime.createRunnableFromGodotCallable(cb1).run()
assert_equal(cb1_data['called'], true)

2
platform/android/java_class_wrapper.cpp
View File

@@ -393,7 +393,7 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
} break; } break;
case ARG_TYPE_CLASS: { case ARG_TYPE_CLASS: {
if (p_args[i]->get_type() == Variant::DICTIONARY) { if (p_args[i]->get_type() == Variant::DICTIONARY) {
argv[i].l = _variant_to_jvalue(env, Variant::DICTIONARY, p_args[i]).l; argv[i].l = _variant_to_jobject(env, Variant::DICTIONARY, p_args[i]);
} else { } else {
Ref<JavaObject> jo = *p_args[i]; Ref<JavaObject> jo = *p_args[i];
if (jo.is_valid()) { if (jo.is_valid()) {

2
platform/android/java_godot_lib_jni.cpp
View File

@@ -536,7 +536,7 @@ JNIEXPORT jobject JNICALL Java_org_godotengine_godot_GodotLib_getEditorProjectMe
String key = jstring_to_string(p_key, env); String key = jstring_to_string(p_key, env);
Variant default_value = _jobject_to_variant(env, p_default_value); Variant default_value = _jobject_to_variant(env, p_default_value);
Variant data = EditorSettings::get_singleton()->get_project_metadata(section, key, default_value); Variant data = EditorSettings::get_singleton()->get_project_metadata(section, key, default_value);
result = _variant_to_jvalue(env, data.get_type(), &data, true); result.l = _variant_to_jobject(env, data.get_type(), &data);
} }
#else #else
WARN_PRINT("Access to the Editor Settings Project Metadata is only available on Editor builds"); WARN_PRINT("Access to the Editor Settings Project Metadata is only available on Editor builds");

115
platform/android/jni_utils.cpp
View File

@@ -90,61 +90,44 @@ String charsequence_to_string(JNIEnv *p_env, jobject p_charsequence) {
return result; return result;
} }
jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_arg, bool force_jobject, int p_depth) { jobject _variant_to_jobject(JNIEnv *env, Variant::Type p_type, const Variant *p_arg, int p_depth) {
jvalue value; jobject ret = nullptr;
if (p_depth > Variant::MAX_RECURSION_DEPTH) { if (p_depth > Variant::MAX_RECURSION_DEPTH) {
ERR_PRINT("Variant is too deep! Bailing."); ERR_PRINT("Variant is too deep! Bailing.");
value.i = 0; return ret;
return value;
} }
env->PushLocalFrame(2); env->PushLocalFrame(2);
switch (p_type) { switch (p_type) {
case Variant::BOOL: { case Variant::BOOL: {
if (force_jobject) { jclass bclass = jni_find_class(env, "java/lang/Boolean");
jclass bclass = jni_find_class(env, "java/lang/Boolean"); jmethodID ctor = env->GetMethodID(bclass, "<init>", "(Z)V");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(Z)V"); jvalue val;
jvalue val; val.z = (bool)(*p_arg);
val.z = (bool)(*p_arg); ret = env->NewObjectA(bclass, ctor, &val);
jobject obj = env->NewObjectA(bclass, ctor, &val); env->DeleteLocalRef(bclass);
value.l = obj;
env->DeleteLocalRef(bclass);
} else {
value.z = *p_arg;
}
} break; } break;
case Variant::INT: { case Variant::INT: {
if (force_jobject) { jclass bclass = jni_find_class(env, "java/lang/Long");
jclass bclass = jni_find_class(env, "java/lang/Long"); jmethodID ctor = env->GetMethodID(bclass, "<init>", "(J)V");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(J)V"); jvalue val;
jvalue val; val.j = (jlong)(*p_arg);
val.j = (jlong)(*p_arg); ret = env->NewObjectA(bclass, ctor, &val);
jobject obj = env->NewObjectA(bclass, ctor, &val); env->DeleteLocalRef(bclass);
value.l = obj;
env->DeleteLocalRef(bclass);
} else {
value.j = (jlong)(*p_arg);
}
} break; } break;
case Variant::FLOAT: { case Variant::FLOAT: {
if (force_jobject) { jclass bclass = jni_find_class(env, "java/lang/Double");
jclass bclass = jni_find_class(env, "java/lang/Double"); jmethodID ctor = env->GetMethodID(bclass, "<init>", "(D)V");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(D)V"); jvalue val;
jvalue val; val.d = (double)(*p_arg);
val.d = (double)(*p_arg); ret = env->NewObjectA(bclass, ctor, &val);
jobject obj = env->NewObjectA(bclass, ctor, &val); env->DeleteLocalRef(bclass);
value.l = obj;
env->DeleteLocalRef(bclass);
} else {
value.f = *p_arg;
}
} break; } break;
case Variant::STRING: { case Variant::STRING: {
String s = *p_arg; String s = *p_arg;
jstring jStr = env->NewStringUTF(s.utf8().get_data()); jstring jStr = env->NewStringUTF(s.utf8().get_data());
value.l = jStr; ret = jStr;
} break; } break;
case Variant::PACKED_STRING_ARRAY: { case Variant::PACKED_STRING_ARRAY: {
Vector<String> sarray = *p_arg; Vector<String> sarray = *p_arg;
@@ -155,13 +138,12 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_ar
env->SetObjectArrayElement(arr, j, str); env->SetObjectArrayElement(arr, j, str);
env->DeleteLocalRef(str); env->DeleteLocalRef(str);
} }
value.l = arr; ret = arr;
} break; } break;
case Variant::CALLABLE: { case Variant::CALLABLE: {
jobject jcallable = callable_to_jcallable(env, *p_arg); jobject jcallable = callable_to_jcallable(env, *p_arg);
value.l = jcallable; ret = jcallable;
} break; } break;
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
@@ -189,10 +171,10 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_ar
for (int j = 0; j < keys.size(); j++) { for (int j = 0; j < keys.size(); j++) {
Variant var = dict[keys[j]]; Variant var = dict[keys[j]];
jvalue valret = _variant_to_jvalue(env, var.get_type(), &var, true, p_depth + 1); jobject jvar = _variant_to_jobject(env, var.get_type(), &var, p_depth + 1);
env->SetObjectArrayElement(jvalues, j, valret.l); env->SetObjectArrayElement(jvalues, j, jvar);
if (valret.l) { if (jvar) {
env->DeleteLocalRef(valret.l); env->DeleteLocalRef(jvar);
} }
} }
@@ -202,7 +184,7 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_ar
env->DeleteLocalRef(jvalues); env->DeleteLocalRef(jvalues);
env->DeleteLocalRef(dclass); env->DeleteLocalRef(dclass);
value.l = jdict; ret = jdict;
} break; } break;
case Variant::ARRAY: { case Variant::ARRAY: {
@@ -211,13 +193,13 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_ar
for (int j = 0; j < array.size(); j++) { for (int j = 0; j < array.size(); j++) {
Variant var = array[j]; Variant var = array[j];
jvalue valret = _variant_to_jvalue(env, var.get_type(), &var, true, p_depth + 1); jobject jvar = _variant_to_jobject(env, var.get_type(), &var, p_depth + 1);
env->SetObjectArrayElement(arr, j, valret.l); env->SetObjectArrayElement(arr, j, jvar);
if (valret.l) { if (jvar) {
env->DeleteLocalRef(valret.l); env->DeleteLocalRef(jvar);
} }
} }
value.l = arr; ret = arr;
} break; } break;
case Variant::PACKED_INT32_ARRAY: { case Variant::PACKED_INT32_ARRAY: {
@@ -225,57 +207,50 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_ar
jintArray arr = env->NewIntArray(array.size()); jintArray arr = env->NewIntArray(array.size());
const int *r = array.ptr(); const int *r = array.ptr();
env->SetIntArrayRegion(arr, 0, array.size(), r); env->SetIntArrayRegion(arr, 0, array.size(), r);
value.l = arr; ret = arr;
} break; } break;
case Variant::PACKED_INT64_ARRAY: { case Variant::PACKED_INT64_ARRAY: {
Vector<int64_t> array = *p_arg; Vector<int64_t> array = *p_arg;
jlongArray arr = env->NewLongArray(array.size()); jlongArray arr = env->NewLongArray(array.size());
const int64_t *r = array.ptr(); const int64_t *r = array.ptr();
env->SetLongArrayRegion(arr, 0, array.size(), r); env->SetLongArrayRegion(arr, 0, array.size(), r);
value.l = arr; ret = arr;
} break; } break;
case Variant::PACKED_BYTE_ARRAY: { case Variant::PACKED_BYTE_ARRAY: {
Vector<uint8_t> array = *p_arg; Vector<uint8_t> array = *p_arg;
jbyteArray arr = env->NewByteArray(array.size()); jbyteArray arr = env->NewByteArray(array.size());
const uint8_t *r = array.ptr(); const uint8_t *r = array.ptr();
env->SetByteArrayRegion(arr, 0, array.size(), reinterpret_cast<const signed char *>(r)); env->SetByteArrayRegion(arr, 0, array.size(), reinterpret_cast<const signed char *>(r));
value.l = arr; ret = arr;
} break; } break;
case Variant::PACKED_FLOAT32_ARRAY: { case Variant::PACKED_FLOAT32_ARRAY: {
Vector<float> array = *p_arg; Vector<float> array = *p_arg;
jfloatArray arr = env->NewFloatArray(array.size()); jfloatArray arr = env->NewFloatArray(array.size());
const float *r = array.ptr(); const float *r = array.ptr();
env->SetFloatArrayRegion(arr, 0, array.size(), r); env->SetFloatArrayRegion(arr, 0, array.size(), r);
value.l = arr; ret = arr;
} break; } break;
case Variant::PACKED_FLOAT64_ARRAY: { case Variant::PACKED_FLOAT64_ARRAY: {
Vector<double> array = *p_arg; Vector<double> array = *p_arg;
jdoubleArray arr = env->NewDoubleArray(array.size()); jdoubleArray arr = env->NewDoubleArray(array.size());
const double *r = array.ptr(); const double *r = array.ptr();
env->SetDoubleArrayRegion(arr, 0, array.size(), r); env->SetDoubleArrayRegion(arr, 0, array.size(), r);
value.l = arr; ret = arr;
} break; } break;
case Variant::OBJECT: { case Variant::OBJECT: {
Ref<JavaObject> generic_object = *p_arg; Ref<JavaObject> generic_object = *p_arg;
if (generic_object.is_valid()) { if (generic_object.is_valid()) {
jobject obj = env->NewLocalRef(generic_object->get_instance()); jobject obj = env->NewLocalRef(generic_object->get_instance());
value.l = obj; ret = obj;
} else {
value.i = 0;
} }
} break; } break;
default: { // Add default to prevent compiler warning about not handling all types.
value.i = 0; default:
} break; break;
} }
value.l = env->PopLocalFrame(value.l);
return value; return env->PopLocalFrame(ret);
} }
String _get_class_name(JNIEnv *env, jclass cls, bool *array) { String _get_class_name(JNIEnv *env, jclass cls, bool *array) {

2
platform/android/jni_utils.h
View File

@@ -38,7 +38,7 @@
#include <jni.h> #include <jni.h>
jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_arg, bool force_jobject = false, int p_depth = 0); jobject _variant_to_jobject(JNIEnv *env, Variant::Type p_type, const Variant *p_arg, int p_depth = 0);
String _get_class_name(JNIEnv *env, jclass cls, bool *array); String _get_class_name(JNIEnv *env, jclass cls, bool *array);

6
platform/android/variant/callable_jni.cpp
View File

@@ -91,8 +91,7 @@ JNIEXPORT jobject JNICALL Java_org_godotengine_godot_variant_Callable_nativeCall
Callable::CallError err; Callable::CallError err;
Variant result; Variant result;
callable.callp(argptrs, count, result, err); callable.callp(argptrs, count, result, err);
jvalue jresult = _variant_to_jvalue(p_env, result.get_type(), &result, true); ret = _variant_to_jobject(p_env, result.get_type(), &result);
ret = jresult.l;
} }
// Manually invoke the destructor to decrease the reference counts for the variant arguments. // Manually invoke the destructor to decrease the reference counts for the variant arguments.
@@ -107,8 +106,7 @@ JNIEXPORT jobject JNICALL Java_org_godotengine_godot_variant_Callable_nativeCall
Callable callable = _generate_callable(p_env, p_object_id, p_method_name, p_parameters); Callable callable = _generate_callable(p_env, p_object_id, p_method_name, p_parameters);
if (callable.is_valid()) { if (callable.is_valid()) {
Variant result = callable.call(); Variant result = callable.call();
jvalue jresult = _variant_to_jvalue(p_env, result.get_type(), &result, true); return _variant_to_jobject(p_env, result.get_type(), &result);
return jresult.l;
} else { } else {
return nullptr; return nullptr;
} }