From d32f638f27bb1b91e97c88a2e7f371aae6748d72 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 25 Jun 2010 11:22:45 +0200 Subject: [PATCH] fix LinphoneAddress.setDisplay with null value --- coreapi/linphonecore_jni.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 6d868675a..7501e25ab 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -562,9 +562,9 @@ extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDisplayName(JNIEnv ,jobject thiz ,jlong address ,jstring jdisplayName) { - const char* displayName = env->GetStringUTFChars(jdisplayName, NULL); + const char* displayName = jdisplayName!= NULL?env->GetStringUTFChars(jdisplayName, NULL):NULL; linphone_address_set_display_name((LinphoneAddress*)address,displayName); - env->ReleaseStringUTFChars(jdisplayName, displayName); + if (displayName != NULL) env->ReleaseStringUTFChars(jdisplayName, displayName); }