Coverity: Pointer Dereferencing & Iterator Mismatch fix

Change-Id: I79e9782a5ea91dd135cc12559fd85471765b7011
Signed-off-by: Dewal Agarwal <d1.agarwal@samsung.com>

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/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;