From c689ad1385804bc023ad2b229bcda44591beb38e Mon Sep 17 00:00:00 2001
From: Jihun Ha <jihun.ha@samsung.com>
Date: Mon, 29 Feb 2016 20:32:57 +0900
Subject: [PATCH] Fix svace defects in things manager

DeleteActionSets function is removed because it is unused anywhere.
Null checking logic is added in timer.c
Initialization for OCResourceHandle is added.

Change-Id: I22bf044e270cc4c31b15f5b6b8c682c10d4733ec
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5259
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
---
 extlibs/timer/timer.c              |  7 +++++++
 resource/csdk/stack/src/oicgroup.c | 18 ------------------
 resource/examples/groupserver.cpp  |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 resource/examples/groupserver.cpp

diff --git a/extlibs/timer/timer.c b/extlibs/timer/timer.c
index 29c9ceb..5686d19 100755
--- a/extlibs/timer/timer.c
+++ b/extlibs/timer/timer.c
@@ -104,6 +104,13 @@ long int getRelativeIntervalOfWeek(struct tm* tp)
 
     time(&current_time);
     current = localtime(&current_time);
+
+    if(current == NULL)
+    {
+        printf("ERROR; Getting local time fails\n");
+        return 0;
+    }
+
     midnight = (struct tm* )malloc(sizeof(struct tm));
 
     if(midnight == NULL)
diff --git a/resource/csdk/stack/src/oicgroup.c b/resource/csdk/stack/src/oicgroup.c
index dd6c6e4..e34d73e 100755
--- a/resource/csdk/stack/src/oicgroup.c
+++ b/resource/csdk/stack/src/oicgroup.c
@@ -496,24 +496,6 @@ OCStackResult FindAndDeleteActionSet(OCResource **resource,
     return OC_STACK_ERROR;
 }
 
-OCStackResult DeleteActionSets(OCResource** resource)
-{
-    OCActionSet *pointer = (*resource)->actionsetHead;
-    OCActionSet *pDel = pointer;
-
-    while (pointer)
-    {
-        pDel = pointer;
-        pointer = pointer->next;
-
-        DeleteActionSet(&pDel);
-        pDel->next = NULL;
-    }
-
-    (*resource)->actionsetHead = NULL;
-    return OC_STACK_OK;
-}
-
 OCStackResult GetActionSet(const char *actionName, OCActionSet *head,
         OCActionSet** actionset)
 {
diff --git a/resource/examples/groupserver.cpp b/resource/examples/groupserver.cpp
old mode 100644
new mode 100755
index e1ec55a..f4b5e4d
--- a/resource/examples/groupserver.cpp
+++ b/resource/examples/groupserver.cpp
@@ -60,7 +60,7 @@ void foundResource(std::shared_ptr< OCResource > resource)
             cout << "\tResource Type : " << resource->getResourceTypes().front() << endl;
             if (resourceURI == "/a/light" || resourceURI == "/a/fan")
             {
-                OCResourceHandle foundResourceHandle;
+                OCResourceHandle foundResourceHandle = nullptr;
                 OCStackResult result = OCPlatform::registerResource(foundResourceHandle, resource);
                 cout << "\tresource registed!" << endl;
                 if (result == OC_STACK_OK)
-- 
2.7.4