Svace issues fixed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/8a9bc2e8d74f6dffab3719120c45f0f7725c1b85
(cherry-picked from 8a9bc2e8d74f6dffab3719120c45f0f7725c1b85)

Change-Id: Ib535052b5b934db1e16064b0e923994c7b3f7b68
Signed-off-by: Iurii Metelytsia <i.metelytsia@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

diff --git a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
index fb7104c679cfe3487e8d778e80f1fc9f21f2b965..962e651c1f4adc7dab147f72e53bb9260fb3eced 100644 (file)
--- a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
@@ -747,7 +747,11 @@ static OCStackResult SaveSubOwnerPSK(OCProvisionDev_t *selectedDeviceInfo)
 
         OICFree( cred->privateData.data );
         cred->privateData.data = (uint8_t *)OICCalloc(1, outSize + 1);
-        VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR);
+        if (NULL == cred->privateData.data)
+        {
+            OICFree(b64Buf);
+            return res;
+        }
 
         strncpy(cred->privateData.data, b64Buf, outSize);
         cred->privateData.data[outSize] = '\0';

diff --git a/resource/csdk/security/src/crlresource.c b/resource/csdk/security/src/crlresource.c
index a59df3b9d81f6f3c311e17fc491d32facc0eeeb1..5a0397a66ff421d1731fc843607703eb39108662 100644 (file)
--- a/resource/csdk/security/src/crlresource.c
+++ b/resource/csdk/security/src/crlresource.c
@@ -789,6 +789,7 @@ void GetDerCrl(ByteArray_t* out)
         if (!out)
         {
             OIC_LOG(ERROR, TAG, "Can't allocate memory for base64 str");
+            DeleteCrl(crlRes);
             return;
         }
         uint32_t len = 0;

diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c
index 7fa8bb20312ae890f2958368a7550ce16194d706..387df181e07a62ee73a2fc7a2083de4b6011b0e4 100644 (file)
--- a/resource/csdk/security/src/directpairing.c
+++ b/resource/csdk/security/src/directpairing.c
@@ -195,6 +195,7 @@ OCStackResult addDev2(OCDirectPairingDev_t **ppList, OCDirectPairingDev_t *pDev)
         if (NULL == ptr->prm)
         {
             OIC_LOG(ERROR, TAG, "Error while allocating memory for prm !!");
+            OICFree(ptr);
             return OC_STACK_NO_MEMORY;
         }
         memcpy(ptr->prm, pDev->prm, sizeof(OicSecPrm_t)*ptr->prmLen);

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index e88a381f693edf78ef0d391e82517f11f254a37c..a07d5da92082be3b68b0cd24d822cf78ab235679 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -1229,14 +1229,8 @@ static OCEntityHandlerRequest *CopyRequest(OCEntityHandlerRequest *entityHandler
     copyOfRequest->numRcvdVendorSpecificHeaderOptions = 0;
     copyOfRequest->rcvdVendorSpecificHeaderOptions = NULL;
 
-    if (copyOfRequest)
-    {
-        OIC_LOG(INFO, TAG, "Copied client request");
-    }
-    else
-    {
-        OIC_LOG(ERROR, TAG, "Error copying client request");
-    }
+    OIC_LOG(INFO, TAG, "Copied client request");
+
     return copyOfRequest;
 }
 #endif // defined(__WITH_DTLS__) || defined (__WITH_TLS__)

diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c
index 8f03b9a00691b6a454d707fc703222e8ecf31443..d0a3e430898f16f59e662fbfdaf40d4e8ae1dd3a 100644 (file)
--- a/resource/csdk/security/src/dpairingresource.c
+++ b/resource/csdk/security/src/dpairingresource.c
@@ -586,14 +586,14 @@ static OCEntityHandlerResult HandleDpairingPutRequest (const OCEntityHandlerRequ
                 // TODO: Append 'if' and 'rt' as workaround
                 // if
                 rsrc->interfaceLen = 1;
-                rsrc->interfaces = (char**)OICCalloc(rsrc->interfaceLen, sizeof(char));
+                rsrc->interfaces = (char**)OICCalloc(rsrc->interfaceLen, sizeof(char*));
                 VERIFY_NON_NULL(TAG, (rsrc->interfaces), ERROR);
                 rsrc->interfaces[0] = OICStrdup(OC_RSRVD_INTERFACE_DEFAULT);
                 VERIFY_NON_NULL(TAG, (rsrc->interfaces[0]), ERROR);
 
                 //rt
                 rsrc->typeLen = 1;
-                rsrc->types = (char**)OICCalloc(rsrc->typeLen, sizeof(char));
+                rsrc->types = (char**)OICCalloc(rsrc->typeLen, sizeof(char*));
                 VERIFY_NON_NULL(TAG, (rsrc->types), ERROR);
                 rsrc->types[0] = OICStrdup("oic.core");
                 VERIFY_NON_NULL(TAG, (rsrc->types[0]), ERROR);