denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Make sure NULL jstrings are converted properly

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-31 18:24:45 +02:00
parent 6de38fe88a
commit 655362464e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/android_jni.h
+8 -5
View File
@@ -90,13 +90,16 @@ static inline bool androidjni_exception_occurred(JNIEnv *env)
*/ */
static inline char *androidjni_convert_jstring(JNIEnv *env, jstring jstr) static inline char *androidjni_convert_jstring(JNIEnv *env, jstring jstr)
{ {
char *str; char *str = NULL;
jsize len; jsize len;
len = (*env)->GetStringUTFLength(env, jstr); if (jstr)
str = malloc(len + 1); {
(*env)->GetStringUTFRegion(env, jstr, 0, len, str); len = (*env)->GetStringUTFLength(env, jstr);
str[len] = '\0'; str = malloc(len + 1);
(*env)->GetStringUTFRegion(env, jstr, 0, len, str);
str[len] = '\0';
}
return str; return str;
} }