android: Make sure NULL jstrings are converted properly

diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.h b/src/frontends/android/jni/libandroidbridge/android_jni.h
index 774d37d7ee9707b8acc98af340639b98b056b4b2..bafd6b72e7e3c74df8fb605a4009f9b6addb0ca7 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/android_jni.h
+++ b/src/frontends/android/jni/libandroidbridge/android_jni.h
@@ -90,13 +90,16 @@ static inline bool androidjni_exception_occurred(JNIEnv *env)
  */
 static inline char *androidjni_convert_jstring(JNIEnv *env, jstring jstr)
 {
-       char *str;
+       char *str = NULL;
        jsize len;
 
-       len = (*env)->GetStringUTFLength(env, jstr);
-       str = malloc(len + 1);
-       (*env)->GetStringUTFRegion(env, jstr, 0, len, str);
-       str[len] = '\0';
+       if (jstr)
+       {
+               len = (*env)->GetStringUTFLength(env, jstr);
+               str = malloc(len + 1);
+               (*env)->GetStringUTFRegion(env, jstr, 0, len, str);
+               str[len] = '\0';
+       }
        return str;
 }