lpac-jni: Return empty string for null C strings
This commit is contained in:
parent
608dadd65d
commit
515d6aea72
|
@ -110,6 +110,9 @@ jstring toJString(JNIEnv *env, const char *pat) {
|
||||||
jstring jstr = NULL;
|
jstring jstr = NULL;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
|
if (pat == NULL)
|
||||||
|
return (*env)->NewLocalRef(env, empty_string);
|
||||||
|
|
||||||
len = strlen(pat);
|
len = strlen(pat);
|
||||||
bytes = (*env)->NewByteArray(env, len);
|
bytes = (*env)->NewByteArray(env, len);
|
||||||
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte *) pat);
|
(*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte *) pat);
|
||||||
|
@ -147,8 +150,8 @@ jobject profile_info_native_to_java(JNIEnv *env, struct es10c_profile_info *info
|
||||||
iccid = toJString(env, info->iccid);
|
iccid = toJString(env, info->iccid);
|
||||||
isdpAid = toJString(env, info->isdpAid);
|
isdpAid = toJString(env, info->isdpAid);
|
||||||
name = toJString(env, info->profileName);
|
name = toJString(env, info->profileName);
|
||||||
nickName = info->profileNickname ? toJString(env, info->profileNickname) : (*env)->NewLocalRef(env, empty_string);
|
nickName = toJString(env, info->profileNickname);
|
||||||
serviceProvider = info->serviceProviderName ? toJString(env, info->serviceProviderName) : (*env)->NewLocalRef(env, empty_string);
|
serviceProvider = toJString(env, info->serviceProviderName);
|
||||||
|
|
||||||
state = (*env)->CallStaticObjectMethod(env, local_profile_state_class,
|
state = (*env)->CallStaticObjectMethod(env, local_profile_state_class,
|
||||||
local_profile_state_from_string,
|
local_profile_state_from_string,
|
||||||
|
|
Loading…
Reference in a new issue