From 4c4312c2eb0c0c3d0d8f2f90b4d1eb4c571b1a27 Mon Sep 17 00:00:00 2001 From: Iurii Metelytsia Date: Fri, 6 Sep 2019 13:40:34 +0300 Subject: [PATCH] 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 Signed-off-by: Sudipto --- .../provisioning/src/multipleownershiptransfermanager.c | 6 +++++- resource/csdk/security/src/crlresource.c | 1 + resource/csdk/security/src/directpairing.c | 1 + resource/csdk/security/src/doxmresource.c | 10 ++-------- resource/csdk/security/src/dpairingresource.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c index fb7104c..962e651 100644 --- 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 a59df3b..5a0397a 100644 --- 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 7fa8bb2..387df18 100644 --- 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 a2248e4..eb55404 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -1227,14 +1227,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 8f03b9a..d0a3e43 100644 --- 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); -- 2.7.4