Merge pull request #5552 from volzhs/fix-jni-null

Fix crash when null value through jni on android

1 files changed, 4 insertions, 0 deletions

diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 3ea2ab1641..45d02876ba 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);