diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-09-04 13:57:05 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-09-04 13:58:49 +0200 |
| commit | d1604d0551ea591c12ce15ab59d2d2f074cf674f (patch) | |
| tree | 4dd1b2f8f0f82333e76fcbc03c8c6985a1f13d53 /src/frontends/android/jni/libandroidbridge/android_jni.h | |
| parent | 1323dc1138246a6e2819bcc20b167b75d52e6d7c (diff) | |
| parent | c89cc2269259fcc2ea140e199cef9eff230e4e80 (diff) | |
| download | strongswan-d1604d0551ea591c12ce15ab59d2d2f074cf674f.tar.bz2 strongswan-d1604d0551ea591c12ce15ab59d2d2f074cf674f.tar.xz | |
Merge branch 'android-client-cert'
Introduces IKEv2 client certificate authentication for the Android App.
Diffstat (limited to 'src/frontends/android/jni/libandroidbridge/android_jni.h')
| -rw-r--r-- | src/frontends/android/jni/libandroidbridge/android_jni.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.h b/src/frontends/android/jni/libandroidbridge/android_jni.h index 774d37d7e..bafd6b72e 100644 --- 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; } |