From: jyong2.kim <jyong2.kim@samsung.com>
Date: Sun, 28 Feb 2016 23:17:15 +0000 (+0900)
Subject: Fix for defects detected by static analysis in Group-manager.
X-Git-Tag: 1.2.0+RC1~584^2^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=416e30aaf51be31ec08716a0fdafef55cd9c4bae;p=platform%2Fupstream%2Fiotivity.git

Fix for defects detected by static analysis in Group-manager.

sceneserver sample is fixed for excetpion catch.
memory deallocate with OICFree() in SceneUtil class.

Change-Id: I258e60a504052a59225cac2506553beaf1a1bd29
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/scene-manager/sampleapp/linux/sceneserver.cpp b/service/scene-manager/sampleapp/linux/sceneserver.cpp
index fb40121..cfef6ae 100755
--- a/service/scene-manager/sampleapp/linux/sceneserver.cpp
+++ b/service/scene-manager/sampleapp/linux/sceneserver.cpp
@@ -238,6 +238,10 @@ bool discoverResource()
     {
          std::cout << e.what() << std::endl;
     }
+    catch(const RCSException& e)
+    {
+        std::cout << e.what() << std::endl;
+    }
     std::unique_lock<std::mutex> lck(mtx);
 
     cond.wait_for(lck, std::chrono::seconds(4));
diff --git a/service/scene-manager/src/SceneUtils.cpp b/service/scene-manager/src/SceneUtils.cpp
index 8b1487f..b2000f6 100644
--- a/service/scene-manager/src/SceneUtils.cpp
+++ b/service/scene-manager/src/SceneUtils.cpp
@@ -81,7 +81,7 @@ namespace OIC
 
             if (size == 0)
             {
-                delete[] netInfo;
+                OICFree(netInfo);
                 throw RCSException("Disabled Network");
             }
 
@@ -92,12 +92,12 @@ namespace OIC
                     std::string retAddress
                         = std::string(netInfo[i]->addr) + ":" + std::to_string(netInfo[i]->port);
 
-                    delete[] netInfo;
+                    OICFree(netInfo);
                     return retAddress;
                 }
             }
 
-            delete[] netInfo;
+            OICFree(netInfo);
             throw RCSException("Not supported Network");
         }