reverted dbus:policy:remove unused directive

- fixed svace issue

Change-Id: Ifccc715866943439ed432974c3652ebf2d23524b
Signed-off-by: Ickhee Woo <ickhee.woo@samsung.com>

diff --git a/packaging/org.tizen.sync.conf b/packaging/org.tizen.sync.conf
index 999a2dfb444439cdc6c157b9486d8d8cb6f89f45..c752a86fdf7e17cb9e6b763e5dc2a5d4e47064e5 100644 (file)
--- a/packaging/org.tizen.sync.conf
+++ b/packaging/org.tizen.sync.conf
@@ -7,6 +7,12 @@
                <allow send_interface="org.tizen.sync"/>
                <allow receive_sender="org.tizen.sync"/>
        </policy>
+       <policy smack="User">
+               <allow own="org.tizen.sync"/>
+               <allow send_destination="org.tizen.sync"/>
+               <allow send_interface="org.tizen.sync"/>
+               <allow receive_sender="org.tizen.sync"/>
+       </policy>
        <policy at_console="true">
                <allow send_destination="org.tizen.sync"/>
                <allow receive_sender="org.tizen.sync"/>

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index 850df3cd09baf5255e979319e14243aab42e0436..178e09cc90c2d25cd366576674ab2f73a36d5753 100644 (file)
--- a/packaging/sync-manager.spec
+++ b/packaging/sync-manager.spec
@@ -2,7 +2,7 @@
 %global __provides_exclude_from ^.*\\.extension-calendar
 
 Name:      sync-service
-Version:   0.1.21
+Version:   0.1.22
 Release:   1
 License:   Apache-2.0
 Summary:   Sync manager daemon

diff --git a/src/sync-service/SyncManager_RepositoryEngine.cpp b/src/sync-service/SyncManager_RepositoryEngine.cpp
index f91ff033df03e07c441dab4fe27bd6ca4c316cb1..5d692273d383bb24944a6d6583a20cebd42c37f7 100644 (file)
--- a/src/sync-service/SyncManager_RepositoryEngine.cpp
+++ b/src/sync-service/SyncManager_RepositoryEngine.cpp
@@ -493,17 +493,20 @@ RepositoryEngine::ReadSyncAdapters(void) {
                while (cur != NULL) {
                        if (!xmlStrcmp(cur->name, XML_NODE_SYNCADAPTER)) {
                                xmlChar* pServiceAppUID = xmlGetProp(cur, XML_ATTR_SYNCADAPTER_SERVICE_APP_ID);
+                               if (!pServiceAppUID)
+                                       return;
                                xmlChar* pPackageId = xmlGetProp(cur, XML_ATTR_PACKAGE_ID);
                                xmlChar* pAppStatus = xmlGetProp(cur, XML_ATTR_APP_STATUS);
 
-                               char pAppUID[100];
+                               char pAppUID[100] = { 0, };
                                if (!strstr((char*)pServiceAppUID, "#"))
                                        snprintf(pAppUID, 100, "%s#%d", pServiceAppUID, 5001);
                                else
-                                       strcpy(pAppUID, (char*)pServiceAppUID);
+                                       strncpy(pAppUID, (char*)pServiceAppUID, sizeof(pServiceAppUID));
 
                                char *pServiceAppId;
-                               pServiceAppId = strtok((char*)pServiceAppUID, "#");
+                               char *ptr;
+                               pServiceAppId = strtok_r((char*)pServiceAppUID, "#", &ptr);
 
                                LOG_LOGD("pAppUID [%s], pServiceAppId [%s]", pAppUID, pServiceAppId);
 
@@ -521,6 +524,14 @@ RepositoryEngine::ReadSyncAdapters(void) {
                                }
                                if (pServiceAppId)
                                        free(pServiceAppId);
+                               if (ptr)
+                                       free(ptr);
+                               if (pServiceAppUID)
+                                       xmlFree(pServiceAppUID);
+                               if (pPackageId)
+                                       xmlFree(pPackageId);
+                               if (pAppStatus)
+                                       xmlFree(pAppStatus);
                        }
                        cur = cur->next;
                }

diff --git a/src/sync-service/SyncManager_SyncJobDispatcher.cpp b/src/sync-service/SyncManager_SyncJobDispatcher.cpp
index 94a5a038d8b6fc9617aeb8c3be3e4a0518d29099..e243176d8acc0013ff9513a3e7e0e7e5a87dc516 100644 (file)
--- a/src/sync-service/SyncManager_SyncJobDispatcher.cpp
+++ b/src/sync-service/SyncManager_SyncJobDispatcher.cpp
@@ -248,6 +248,7 @@ SyncJobDispatcher::TryStartingNextJobLocked() {
                if (syncJobToRun == NULL)
                        LOG_LOGD("syncJobToRun is null");
        }
+
        pthread_mutex_unlock(&(SyncManager::GetInstance()->__syncJobQueueMutex));
 
        if (syncJobToRun != NULL) {

diff --git a/src/sync-service/SyncManager_SyncManager.cpp b/src/sync-service/SyncManager_SyncManager.cpp
index 4b7b08c8bfcc732446dcdbce5e404974e1eab3e8..14c63e69fe16bdc35eff108e8c1a029f1d6647e7 100644 (file)
--- a/src/sync-service/SyncManager_SyncManager.cpp
+++ b/src/sync-service/SyncManager_SyncManager.cpp
@@ -693,7 +693,11 @@ SyncManager::SyncManager(void)
        , __pSyncAdapterAggregator(NULL)
        , __pSyncJobsAggregator(NULL)
        , __pCurrentSyncJobQueue(NULL)
-       , __accountSubscriptionHandle(NULL) {
+       , __accountSubscriptionHandle(NULL)
+       , __pPkgmgrClientUninstall(pkgmgr_client_new(PC_LISTENING))
+       , __pPkgmgrClientEnDisable(pkgmgr_client_new(PC_LISTENING)) {
+       pthread_mutex_init(&__syncJobQueueMutex, NULL);
+       pthread_mutex_init(&__currJobQueueMutex, NULL);
 }
 
 

diff --git a/src/sync-service/SyncManager_SyncWorker.cpp b/src/sync-service/SyncManager_SyncWorker.cpp
index 6d199626c4a5ac465e8e90a65df543848f935ae5..ef9a36e19ca48660ac23931299928fdcebe08f4c 100644 (file)
--- a/src/sync-service/SyncManager_SyncWorker.cpp
+++ b/src/sync-service/SyncManager_SyncWorker.cpp
@@ -30,6 +30,22 @@
 
 
 SyncWorker::SyncWorker(void) {
+       /*
+       pthread_mutex_t __pendingRequestsMutex;
+       SyncDispatchMessage __message;
+       GMainContext* __pContext;
+       GMainLoop* __pLoop;
+       GIOChannel* __pChannel;
+       GSource* __pSource;
+       GThread* __pThread;
+       */
+       pthread_mutex_init(&__pendingRequestsMutex, NULL);
+       __message = SYNC_FINISHED;
+       __pContext = NULL;
+       __pLoop = g_main_loop_new(__pContext, FALSE);
+       __pChannel = NULL;
+       __pSource = NULL;
+       __pThread = NULL;
 }