[IOT-1405, IOT-1418] Bug fixes

Memory leak issue in Secure resources
scan newline '\n' at end of line

Change-Id: I8e7675fef88670ea6f4fc7c38a1b484cc6e28b50
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 0267c7ab809830f60d4110550f1f9c0bf8b0868f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12999

diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c
index e887a3ee6d59d6eaaca3542ba23fc0e8cf47279c..a8485af02644ed04bb330df594303a7d8aa545c7 100644 (file)
--- a/resource/csdk/security/src/aclresource.c
+++ b/resource/csdk/security/src/aclresource.c
@@ -2096,6 +2096,7 @@ OCStackResult InitACLResource()
     {
         // Read ACL resource from PS
         gAcl = CBORPayloadToAcl(data, size);
+        OICFree(data);
     }
     /*
      * If SVR database in persistent storage got corrupted or

diff --git a/resource/csdk/security/src/amsmgr.c b/resource/csdk/security/src/amsmgr.c
index e34896907b3d3408fcd12f206822f8a267d7f1e3..90f8484e1094dc1bf69ea4611a851aa7ec517efb 100644 (file)
--- a/resource/csdk/security/src/amsmgr.c
+++ b/resource/csdk/security/src/amsmgr.c
@@ -122,7 +122,7 @@ static OCStackApplicationResult AmsMgrDiscoveryCallback(void *ctx, OCDoHandle ha
 
     OicUuid_t deviceId = {.id={0}};
     memcpy(&deviceId, &doxm->deviceID, sizeof(deviceId));
-    OICFree(doxm);
+    DeleteDoxmBinData(doxm);
 
     /* TODO : By assuming that the first response received is the actual
      * AMS service, a 'bad device' can cause DoS attack.

diff --git a/resource/csdk/security/src/psinterface.c b/resource/csdk/security/src/psinterface.c
index bb5fab1419cec219d710218a3a420a0c334f9b27..a7f87a9340640cde787870a37911a353938e5010 100644 (file)
--- a/resource/csdk/security/src/psinterface.c
+++ b/resource/csdk/security/src/psinterface.c
@@ -654,7 +654,7 @@ OCStackResult CreateResetProfile(void)
             memcpy(&pstat->rownerID, &emptyUuid, sizeof(OicUuid_t));
 
             ret = PstatToCBORPayload(pstat, &pstatCbor, &pstatCborLen, false);
-            OICFree(pstat);
+            DeletePstatBinData(pstat);
         }
         if (doxmCbor)
         {
@@ -669,7 +669,7 @@ OCStackResult CreateResetProfile(void)
             memcpy(&doxm->rownerID, &emptyUuid, sizeof(OicUuid_t));
 
             ret = DoxmToCBORPayload(doxm, &doxmCbor, &doxmCborLen, false);
-            OICFree(doxm);
+            DeleteDoxmBinData(doxm);
         }
 
         {

diff --git a/resource/provisioning/examples/cloudClient.cpp b/resource/provisioning/examples/cloudClient.cpp
index 29aa159695742e822fb52edc0ae8eb49d1297c2a..a933cf289f08e26839a6585e95d7370573ab49c3 100644 (file)
--- a/resource/provisioning/examples/cloudClient.cpp
+++ b/resource/provisioning/examples/cloudClient.cpp
@@ -289,6 +289,7 @@ static void userRequests(void *data)
 
         int request = 0;
         scanf("%d", &request);
+        getchar();
 
         switch (request)
         {