From ccb37f16dce86457ccc8c5646f28b93c5834aae5 Mon Sep 17 00:00:00 2001 From: Chul Lee Date: Wed, 19 Oct 2016 15:42:12 +0900 Subject: [PATCH] SVACE issue fixes Change-Id: I4cd1fb23818a560449ae1ff3f2635c14ef093da7 Signed-off-by: Chul Lee Reviewed-on: https://gerrit.iotivity.org/gerrit/13435 Reviewed-by: Jongmin Choi Tested-by: jenkins-iotivity Reviewed-by: dongik Lee Reviewed-by: Randeep Singh (cherry picked from commit 2ee97889f591fccaec860fb7ae7d0d95148c9311) Reviewed-on: https://gerrit.iotivity.org/gerrit/13447 --- .../csdk/security/provisioning/sample/sampleserver_randompin.cpp | 7 ++++++- resource/csdk/security/provisioning/src/pmutility.c | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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); } -- 2.7.4