From b5d255ec697ca0c5b862c425bf26bb04600ed916 Mon Sep 17 00:00:00 2001 From: Ashwini Kumar Date: Mon, 26 Sep 2016 15:09:02 +0530 Subject: [PATCH] svace issue fixes Change-Id: I7832bab14a433e3a6b55c378ae0000b5e24882a5 Signed-off-by: Ashwini Kumar Reviewed-on: https://gerrit.iotivity.org/gerrit/12205 Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh (cherry picked from commit 897dc94c292bb5b0433bbb10e8f47a1d88bd0059) Reviewed-on: https://gerrit.iotivity.org/gerrit/12319 Tested-by: Randeep Singh --- .../provisioning/unittest/provisioningdatabasemanager.cpp | 2 +- resource/provisioning/examples/cloudClient.cpp | 7 +++++-- resource/provisioning/examples/cloudWrapper.cpp | 14 ++++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp index 14338f2..3751f2b 100644 --- a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp +++ b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp @@ -104,7 +104,7 @@ TEST(PDMAddDeviceTest, ValidUUID) memcpy(&uid.id, &id, UUID_LENGTH); EXPECT_EQ(OC_STACK_OK, PDMAddDevice(&uid)); - PDMDeleteDevice(&uid); + EXPECT_EQ(OC_STACK_OK, PDMDeleteDevice(&uid)); } TEST(PDMLinkDevicesTest, NULLDevice1) diff --git a/resource/provisioning/examples/cloudClient.cpp b/resource/provisioning/examples/cloudClient.cpp index bba9220..29aa159 100644 --- a/resource/provisioning/examples/cloudClient.cpp +++ b/resource/provisioning/examples/cloudClient.cpp @@ -227,7 +227,7 @@ static int saveTrustCert(void) if (fp) { size_t fsize; - if (fseeko(fp, 0, SEEK_END) == 0 && (fsize = ftello(fp))) + if (fseeko(fp, 0, SEEK_END) == 0 && (fsize = ftello(fp)) > 0) { trustCertChainArray.data = (uint8_t*)OICCalloc(1, fsize+1); trustCertChainArray.len = fsize+1; @@ -238,7 +238,10 @@ static int saveTrustCert(void) return res; } rewind(fp); - fsize = fread(trustCertChainArray.data, 1, fsize, fp); + if (fsize != fread(trustCertChainArray.data, 1, fsize, fp)) + { + OIC_LOG(ERROR, TAG, "Certiface not read completely"); + } fclose(fp); } } diff --git a/resource/provisioning/examples/cloudWrapper.cpp b/resource/provisioning/examples/cloudWrapper.cpp index 49c82d2..5095d32 100644 --- a/resource/provisioning/examples/cloudWrapper.cpp +++ b/resource/provisioning/examples/cloudWrapper.cpp @@ -122,7 +122,7 @@ static void readStringArray(stringArray_t *list, int length, const char* descrip char **item = NULL; - if (0 == count) + if (0 >= count) { return; } @@ -147,7 +147,7 @@ static void readStringArray(stringArray_t *list, int length, const char* descrip readString(item[i], length, hint, example); } list->array = item; - list->length = count; + list->length = (size_t)count; return; no_memory: @@ -238,7 +238,7 @@ static int ReadFile(const char *name, OCByteString *crl) } crl->bytes = buffer; - crl->len = length; + crl->len = (size_t)length; result = 0; exit: @@ -336,14 +336,20 @@ OCStackResult OCWrapperAclIndividualUpdateAce(const OCDevAddr *endPoint, OCCloud { OCStackResult result = OC_STACK_NO_MEMORY; int i = 0, j = 0; + cloudAce_t *aces = NULL; char aclid[MAX_ID_LENGTH] = { 0 }; readString(aclid, sizeof(aclid), "ace id", ACL_ID_EXAMPLE); int acllist_count = 0; readInteger(&acllist_count, "acl list count", "1"); + if (0 >= acllist_count) + { + OIC_LOG(ERROR, TAG, "Wrong number of aclList"); + goto exit; + } - cloudAce_t *aces = (cloudAce_t*)OICCalloc(acllist_count, sizeof(cloudAce_t)); + aces = (cloudAce_t*)OICCalloc(acllist_count, sizeof(cloudAce_t)); if (!aces) { OIC_LOG(ERROR, TAG, "Can't allocate memory for aces"); -- 2.7.4