Allow null strings in LpConfig.getString

This commit is contained in:
Sylvain Berfini 2013-10-07 16:35:05 +02:00
parent 470227cf85
commit 13442d397b

View file

@ -3122,13 +3122,21 @@ extern "C" void Java_org_linphone_core_LpConfigImpl_setString(JNIEnv *env, jobje
extern "C" jstring Java_org_linphone_core_LpConfigImpl_getString(JNIEnv *env, jobject thiz, jlong lpc,
jstring section, jstring key, jstring defaultValue) {
const char *csection = env->GetStringUTFChars(section, NULL);
const char *csection = env->GetStringUTFChars(section, NULL);
const char *ckey = env->GetStringUTFChars(key, NULL);
const char *cvalue = env->GetStringUTFChars(defaultValue, NULL);
const char *returnValue = lp_config_get_string((LpConfig *)lpc, csection, ckey, cvalue);
const char *cvalue;
if (defaultValue == NULL) {
cvalue = NULL;
} else {
cvalue = env->GetStringUTFChars(defaultValue, NULL);
}
const char *returnValue = lp_config_get_string((LpConfig *)lpc, csection, ckey, cvalue);
env->ReleaseStringUTFChars(section, csection);
env->ReleaseStringUTFChars(key, ckey);
env->ReleaseStringUTFChars(defaultValue, cvalue);
if (cvalue)
env->ReleaseStringUTFChars(defaultValue, cvalue);
return returnValue ? env->NewStringUTF(returnValue) : NULL;
}
extern "C" void Java_org_linphone_core_LpConfigImpl_setIntRange(JNIEnv *env, jobject thiz, jlong lpc,