diff options
| author | Rémi Verschelde | 2016-07-04 23:39:31 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-04 23:39:31 +0200 |
| commit | 90b5b0d1c939eea5e15bc42349b99fbf65d68ce5 (patch) | |
| tree | deb95e5058e023b73c895ddf84f32de6962b7959 /platform/android/java_glue.cpp | |
| parent | 176920278f7cdaca9ccbdebc9894f444902e6cf7 (diff) | |
| parent | b09dbaa78e716078806fdf1f88dea279d7d3c257 (diff) | |
| download | godot-90b5b0d1c939eea5e15bc42349b99fbf65d68ce5.tar.gz godot-90b5b0d1c939eea5e15bc42349b99fbf65d68ce5.tar.zst godot-90b5b0d1c939eea5e15bc42349b99fbf65d68ce5.zip | |
Merge pull request #5552 from volzhs/fix-jni-null
Fix crash when null value through jni on android
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 3ea2ab164..45d02876b 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -238,6 +238,10 @@ String _get_class_name(JNIEnv * env, jclass cls, bool* array) { Variant _jobject_to_variant(JNIEnv * env, jobject obj) { + if (obj == NULL) { + return Variant(); + } + jclass c = env->GetObjectClass(obj); bool array; String name = _get_class_name(env, c, &array); |