From: Chul Lee <chuls.lee@samsung.com>
Date: Wed, 19 Oct 2016 06:42:12 +0000 (+0900)
Subject: SVACE issue fixes
X-Git-Tag: 1.3.0~1055^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccb37f16dce86457ccc8c5646f28b93c5834aae5;p=platform%2Fupstream%2Fiotivity.git

SVACE issue fixes

Change-Id: I4cd1fb23818a560449ae1ff3f2635c14ef093da7
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13435
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 2ee97889f591fccaec860fb7ae7d0d95148c9311)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13447
---

diff --git a/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp b/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
index f8e651a..a7a9d8f 100644
--- a/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
+++ b/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
@@ -156,7 +156,12 @@ static void* oc_process_loop(void* ptr)
 
     while(g_LoopFlag)
     {
-        OCProcess();
+        if (OCProcess() != OC_STACK_OK)
+        {
+            OIC_LOG(ERROR, TAG, "OCStack process error");
+            g_LoopFlag = false;
+            break;
+        }
         nanosleep(&timeout, NULL);
     }
     pthread_join(&oc_process_thread, NULL);
diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index e06e591..d6e24e8 100644
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -844,7 +844,10 @@ static void DeviceDiscoveryDeleteHandler(void *ctx)
         {
             OIC_LOG_V(DEBUG, TAG, "OCCancel - %s : %d",
                             pDev->endpoint.addr, pDev->endpoint.port);
-            OCCancel(pDev->handle,OC_HIGH_QOS,NULL,0);
+            if(OC_STACK_OK !=  OCCancel(pDev->handle,OC_HIGH_QOS,NULL,0))
+            {
+                OIC_LOG(ERROR, TAG, "Failed to remove registered callback");
+            }
         }
         PMDeleteDeviceList(pDInfo->pCandidateList);
     }