[Coverity Fixes][Job Scheduler]

Change-Id: I474f984844437d7d2a764eaa3d06e9389fd83459
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/server/JobManager.cpp b/src/server/JobManager.cpp
index c07d31753474e51703262b65245800465e45144b..ff769d2309b7a01bb1985bd353549177c8603458 100644 (file)
--- a/src/server/JobManager.cpp
+++ b/src/server/JobManager.cpp
@@ -120,7 +120,8 @@ int JobManager::addJob(JobInfo* jobInfo, IClient* owner)
        JobInfo* duplicate = __getDuplicate(owner->getName(), jobInfo);
        if (duplicate) {
                _W("Duplicate found: Job-%d", duplicate->getId());
-               delete jobInfo;
+               delete (jobInfo);
+               jobInfo = NULL;
                return duplicate->getId();
        }
 

diff --git a/src/server/MethodCallHandler.cpp b/src/server/MethodCallHandler.cpp
index 5b36222fea44784396dabd4ed0597cf8b10376ea..1a8dbaba1f0ef6b3f960cd450c2a9b6587d0a082 100644 (file)
--- a/src/server/MethodCallHandler.cpp
+++ b/src/server/MethodCallHandler.cpp
@@ -129,11 +129,13 @@ void MethodCallHandler::__addJob(IMethodCall& methodCall)
                jobId = __getJobManager().addJob(jobInfo, __caller);
        } catch (const int error) {
                delete jobInfo;
+               jobInfo = NULL;
                throw;
        }
 
        if (jobId < 0) {
                delete jobInfo;
+               jobInfo = NULL;
                throw jobId;
        }
 

diff --git a/src/server/publisher/UserActivity.cpp b/src/server/publisher/UserActivity.cpp
index 1d5fb503f8ccbb5ad8d6a085f35e07c6afa95877..8077f461c9ec2c2e77efb5d8f19383e0612dac54 100644 (file)
--- a/src/server/publisher/UserActivity.cpp
+++ b/src/server/publisher/UserActivity.cpp
@@ -138,8 +138,13 @@ void UserActivity::read()
 
 void UserActivity::subscribe()
 {
-       activity_create(&__handle);
-       activity_start_recognition(__handle, getActivityType(), getCallback(), this);
+       int err;
+
+       err = activity_create(&__handle);
+       IF_FAIL_THROW((err == E_NONE), E_NO_MEM);
+
+       err = activity_start_recognition(__handle, getActivityType(), getCallback(), this);
+       IF_FAIL_THROW((err == E_NONE), E_INV_OP);
 }
 
 void UserActivity::unsubscribe()

diff --git a/src/shared/Attribute.cpp b/src/shared/Attribute.cpp
index 958a37ad50fdcae1f6f6ac5384705f02dc32f40a..94eceddd11a3c2c4b55375984af7ee7305bc0a6c 100644 (file)
--- a/src/shared/Attribute.cpp
+++ b/src/shared/Attribute.cpp
@@ -183,7 +183,7 @@ bool IntegerAttribute::operator<=(const int& antecedent)
        if (!__targets.empty() && __targets.find(antecedent) == __targets.end())
                return false;
 
-       if (!__nonTargets.empty() && __nonTargets.find(antecedent) != __targets.end())
+       if (!__nonTargets.empty() && __nonTargets.find(antecedent) != __nonTargets.end())
                return false;
 
        return true;
@@ -264,7 +264,7 @@ bool StringAttribute::operator<=(const std::string& antecedent)
        if (!__targets.empty() && __targets.find(antecedent) == __targets.end())
                return false;
 
-       if (!__nonTargets.empty() && __nonTargets.find(antecedent) != __targets.end())
+       if (!__nonTargets.empty() && __nonTargets.find(antecedent) != __nonTargets.end())
                return false;
 
        return true;