fixed bs: g_singleton is not allocated before using

[platform/core/pim/pims-ipc.git] / src / pims-ipc-svc.c

diff --git a/src/pims-ipc-svc.c b/src/pims-ipc-svc.c
index 0d86912..925335d 100644 (file)
--- a/src/pims-ipc-svc.c
+++ b/src/pims-ipc-svc.c
@@ -218,15 +218,9 @@ API int pims_ipc_svc_init(char *service, gid_t group, mode_t mode)
                return -1;
        }
 
-       int ret = cynara_initialize(&_g_singleton->cynara, NULL);
-       if (CYNARA_API_SUCCESS != ret) {
-               char errmsg[1024];
-               cynara_strerror(ret, errmsg, sizeof(errmsg));
-               ERROR("cynara_initialize() Fail(%d,%s)", ret, errmsg);
-               return -1;
-       }
-
        _g_singleton = g_new0(pims_ipc_svc_s, 1);
+       ASSERT(_g_singleton);
+
        _g_singleton->service = g_strdup(service);
        _g_singleton->group = group;
        _g_singleton->mode = mode;
@@ -262,6 +256,13 @@ API int pims_ipc_svc_init(char *service, gid_t group, mode_t mode)
        pthread_mutex_init(&_g_singleton->cynara_mutex, 0);
        _g_singleton->epoll_stop_thread = false;
 
+       int ret = cynara_initialize(&_g_singleton->cynara, NULL);
+       if (CYNARA_API_SUCCESS != ret) {
+               char errmsg[1024] = {0};
+               cynara_strerror(ret, errmsg, sizeof(errmsg));
+               ERROR("cynara_initialize() Fail(%d,%s)", ret, errmsg);
+               return -1;
+       }
        return 0;
 }
 
@@ -304,7 +305,7 @@ API int pims_ipc_svc_deinit(void)
        pthread_mutex_lock(&_g_singleton->cynara_mutex);
        int ret = cynara_finish(_g_singleton->cynara);
        if (CYNARA_API_SUCCESS != ret) {
-               char errmsg[1024];
+               char errmsg[1024] = {0};
                cynara_strerror(ret, errmsg, sizeof(errmsg));
                ERROR("cynara_finish() Fail(%d,%s)", ret, errmsg);
        }
@@ -796,7 +797,7 @@ static int _create_client_info(int fd, pims_ipc_client_info_s **p_client_info)
 {
        int ret;
        pid_t pid;
-       char errmsg[1024];
+       char errmsg[1024] = {0};
 
        pims_ipc_client_info_s *client_info = calloc(1, sizeof(pims_ipc_client_info_s));
        if (NULL == client_info) {