android: Make sure NULL jstrings are converted properly

This commit is contained in:
Tobias Brunner 2012-08-28 15:29:35 +02:00
parent 6de38fe88a
commit 655362464e
1 changed files with 8 additions and 5 deletions

View File

@ -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;
}