From cde2323e7ffa79656c7296db3cd6320dc2016dfd Mon Sep 17 00:00:00 2001 From: "jyong2.kim" Date: Fri, 25 Mar 2016 08:02:57 +0900 Subject: [PATCH] [IOT-1040] Fixed for jira issue about RH android. prevented crash when init is called with null String at address. Change-Id: I390fdd036e6afae44af36d935564b2fa5045d990 Signed-off-by: jyong2.kim Reviewed-on: https://gerrit.iotivity.org/gerrit/6307 Tested-by: jenkins-iotivity Reviewed-by: Hun-je Yeon Reviewed-by: Madan Lanka Reviewed-by: Uze Choi (cherry picked from commit 9cbaf9309f0f671b899641a3ed2286621b5b6ed5) Reviewed-on: https://gerrit.iotivity.org/gerrit/7687 --- .../android/resource_hosting/jni/ResourceHosing_JNI.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/service/resource-hosting/android/resource_hosting/jni/ResourceHosing_JNI.cpp b/service/resource-hosting/android/resource_hosting/jni/ResourceHosing_JNI.cpp index faca8ce..dde9d72 100644 --- a/service/resource-hosting/android/resource_hosting/jni/ResourceHosing_JNI.cpp +++ b/service/resource-hosting/android/resource_hosting/jni/ResourceHosing_JNI.cpp @@ -91,17 +91,16 @@ JNIEXPORT jint JNICALL Java_org_iotivity_ResourceHosting_ResourceHosting_OICCoor JNIEXPORT jint JNICALL Java_org_iotivity_ResourceHosting_ResourceHosting_ResourceHostingInit (JNIEnv *env, jobject obj,jstring j_addr) { - const char* addr = env->GetStringUTFChars(j_addr,NULL); - if (NULL == j_addr) + { return (jint)OCSTACK_ERROR; + } - if(OCInit(addr,USE_RANDOM_PORT,OC_CLIENT_SERVER)!=OC_STACK_OK) + if(OCInit1(OC_CLIENT_SERVER, OC_DEFAULT_FLAGS, OC_DEFAULT_FLAGS)) { return (jint)OCSTACK_ERROR; } - env->ReleaseStringUTFChars(j_addr,addr); return (jint)OCSTACK_OK; } -- 2.7.4