fixed an issue there is no check null for connection manager.

Change-Id: I6cdde605bce31634cb80073ec28239edf4f72ceb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
index 9ef823d..c4e43e3 100644 (file)
--- a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
+++ b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
@@ -504,6 +504,12 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
 
     if (GATT_SUCCESS == status)
     {
+        if (!g_connectedDeviceSet)
+        {
+            OIC_LOG(ERROR, TAG, "g_connectedDeviceSet is null");
+            return;
+        }
+
         jstring jni_address = CAManagerGetAddressFromGatt(env, gatt);
         if (!jni_address)
         {
@@ -515,6 +521,7 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
         if (!address)
         {
             OIC_LOG(ERROR, TAG, "address is null");
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
         OIC_LOG_V(DEBUG, TAG, "ServicesDiscovered device : %s", address);
@@ -525,13 +532,19 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
         if (!jni_cls_set)
         {
             OIC_LOG(ERROR, TAG, "jni_cls_set is null");
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
-        jmethodID jni_mid_iterator = (*env)->GetMethodID(env, jni_cls_set, "iterator", "()Ljava/util/Iterator;");
+        jmethodID jni_mid_iterator = (*env)->GetMethodID(env, jni_cls_set, "iterator",
+                                                            "()Ljava/util/Iterator;");
         if (!jni_mid_iterator)
         {
             OIC_LOG(ERROR, TAG, "jni_mid_iterator is null");
+            (*env)->DeleteLocalRef(env, jni_cls_set);
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
@@ -539,6 +552,9 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
         if (!jni_obj_iter)
         {
             OIC_LOG(ERROR, TAG, "jni_obj_iter is null");
+            (*env)->DeleteLocalRef(env, jni_cls_set);
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
@@ -547,6 +563,10 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
         if (!jni_cls_iterator)
         {
             OIC_LOG(ERROR, TAG, "jni_cls_iterator is null");
+            (*env)->DeleteLocalRef(env, jni_obj_iter);
+            (*env)->DeleteLocalRef(env, jni_cls_set);
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
@@ -554,24 +574,52 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
         if (!jni_mid_hasNext)
         {
             OIC_LOG(ERROR, TAG, "jni_mid_hasNext is null");
+            (*env)->DeleteLocalRef(env, jni_cls_iterator);
+            (*env)->DeleteLocalRef(env, jni_obj_iter);
+            (*env)->DeleteLocalRef(env, jni_cls_set);
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
-        jmethodID jni_mid_next = (*env)->GetMethodID(env, jni_cls_iterator, "next", "()Ljava/lang/Object;");
+        jmethodID jni_mid_next = (*env)->GetMethodID(env, jni_cls_iterator, "next",
+                                                        "()Ljava/lang/Object;");
         if (!jni_mid_next)
         {
             OIC_LOG(ERROR, TAG, "jni_mid_next is null");
+            (*env)->DeleteLocalRef(env, jni_cls_iterator);
+            (*env)->DeleteLocalRef(env, jni_obj_iter);
+            (*env)->DeleteLocalRef(env, jni_cls_set);
+            (*env)->ReleaseStringUTFChars(env, jni_address, address);
+            (*env)->DeleteLocalRef(env, jni_address);
             return;
         }
 
         // Iterate over the entry Set
         while ((*env)->CallBooleanMethod(env, jni_obj_iter, jni_mid_hasNext))
         {
-            jstring jni_str_entry = (jstring)(*env)->CallObjectMethod(env, jni_obj_iter, jni_mid_next);
+            jstring jni_str_entry = (jstring)(*env)->CallObjectMethod(env, jni_obj_iter,
+                                                                        jni_mid_next);
+            if (!jni_str_entry)
+            {
+                OIC_LOG(ERROR, TAG, "jni_str_entry is null");
+                (*env)->DeleteLocalRef(env, jni_cls_iterator);
+                (*env)->DeleteLocalRef(env, jni_obj_iter);
+                (*env)->DeleteLocalRef(env, jni_cls_set);
+                (*env)->ReleaseStringUTFChars(env, jni_address, address);
+                (*env)->DeleteLocalRef(env, jni_address);
+                return;
+            }
             const char* foundAddress = (*env)->GetStringUTFChars(env, jni_str_entry, NULL);
             if (!foundAddress)
             {
                 OIC_LOG(ERROR, TAG, "addr is null");
+                (*env)->DeleteLocalRef(env, jni_str_entry);
+                (*env)->DeleteLocalRef(env, jni_cls_iterator);
+                (*env)->DeleteLocalRef(env, jni_obj_iter);
+                (*env)->DeleteLocalRef(env, jni_cls_set);
+                (*env)->ReleaseStringUTFChars(env, jni_address, address);
+                (*env)->DeleteLocalRef(env, jni_address);
                 return;
             }
             OIC_LOG_V(INFO, TAG, "found last connected address [%s] from SharedPreferences",
@@ -603,12 +651,12 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
             g_connStateCB(CA_ADAPTER_GATT_BTLE, address, true);
             OIC_LOG(DEBUG, TAG, "LE Connected callback is called");
         }
+
+        (*env)->DeleteLocalRef(env, jni_cls_iterator);
+        (*env)->DeleteLocalRef(env, jni_obj_iter);
+        (*env)->DeleteLocalRef(env, jni_cls_set);
         (*env)->ReleaseStringUTFChars(env, jni_address, address);
         (*env)->DeleteLocalRef(env, jni_address);
-        (*env)->DeleteLocalRef(env, jni_cls_set);
-        (*env)->DeleteLocalRef(env, jni_obj_iter);
-        (*env)->DeleteLocalRef(env, jni_cls_iterator);
-
         OIC_LOG(INFO, TAG, "ServicesDiscovery is successful");
     }
     else