fix svace issues

Change-Id: Ic1001018e1c26b2f22220c8e898d7263e8143293
Signed-off-by: Jongkyu Koo <jk.koo@samsung.com>

diff --git a/client/ctsvc_client_ipc.c b/client/ctsvc_client_ipc.c
index 73ba11e..8a4682c 100644 (file)
--- a/client/ctsvc_client_ipc.c
+++ b/client/ctsvc_client_ipc.c
@@ -219,8 +219,11 @@ int ctsvc_ipc_disconnect(contacts_h contact, unsigned int handle_id, int connect
        }
 
        ret = ctsvc_ipc_marshal_handle(contact, indata);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_ipc_marshal_handle() Fail(%d)", ret);
-
+       if (CONTACTS_ERROR_NONE != ret) {
+               CTS_ERR("ctsvc_ipc_marshal_handle() Fail(%d)", ret);
+               pims_ipc_data_destroy(indata);
+               return ret;
+       }
        if (pims_ipc_call(ipc_data->ipc, CTSVC_IPC_MODULE, CTSVC_IPC_SERVER_DISCONNECT, indata, &outdata) != 0) {
                pims_ipc_data_destroy(indata);
                CTS_ERR("[GLOBAL_IPC_CHANNEL] pims_ipc_call failed");

diff --git a/server/ctsvc_number_utils.c b/server/ctsvc_number_utils.c
index b2403af..cd29295 100644 (file)
--- a/server/ctsvc_number_utils.c
+++ b/server/ctsvc_number_utils.c
@@ -315,9 +315,11 @@ char* ctsvc_get_network_cc(bool reload)
                return NULL;
        }
 
-       if (temp && 3 < strlen(temp))
-               temp[3] = '\0';
-       mcc = atoi(temp);
+       if (temp) {
+               if(3 < strlen(temp))
+                       temp[3] = '\0';
+               mcc = atoi(temp);
+       }
        for (i=0;i<sizeof(__mcc_cc_list)/sizeof(ctsvc_mcc_cc_map);i++) {
                if (__mcc_cc_list[i].mcc == mcc) {
                        cc = __mcc_cc_list[i].cc;

diff --git a/server/ctsvc_server.c b/server/ctsvc_server.c
index 81b0759..a35ba4b 100644 (file)
--- a/server/ctsvc_server.c
+++ b/server/ctsvc_server.c
@@ -176,10 +176,8 @@ void ctsvc_create_file_set_permission(const char* file, mode_t mode)
        {
                ret = fchown(fd, -1, CTSVC_SECURITY_FILE_GROUP);
                if (-1 == ret)
-               {
                        printf("Fail to fchown\n");
-                       return;
-               }
+
                close(fd);
        }
 

diff --git a/server/ctsvc_server_change_subject.c b/server/ctsvc_server_change_subject.c
index 38d1b2a..f73e48b 100644 (file)
--- a/server/ctsvc_server_change_subject.c
+++ b/server/ctsvc_server_change_subject.c
@@ -57,6 +57,7 @@ static gboolean __ctsvc_publish_changes_with_data(const char *view_uri, char *da
 
        if (pims_ipc_svc_publish(CTSVC_IPC_SUBSCRIBE_MODULE, (char*)view_uri, indata) != 0) {
                CTS_ERR("pims_ipc_svc_publish error (%s)\n", view_uri);
+               pims_ipc_data_destroy(indata);
                return false;
        }