Removed Tab and extra space.
Fixed Remaining Defects.
Fixed Defect in provisioning/unittest/otmunittest.cpp
Change-Id: I1d163b1a39fe858323c5c799f9e26ba6a1a3f620
Signed-off-by: Vinay Bhatia <vinay.bhatia@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9031
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
cred->privateData.data = (uint8_t *)OICCalloc(1, outSize + 1);
VERIFY_NON_NULL(TAG, cred->privateData.data, ERROR);
- strcpy(cred->privateData.data, b64Buf);
+ strncpy(cred->privateData.data, b64Buf, outSize);
+ cred->privateData.data[outSize] = '\0';
cred->privateData.encoding = OIC_ENCODING_BASE64;
cred->privateData.len = outSize;
OICFree(b64Buf);
// Use seure port of doxm for OTM and Provision.
while (resPayload)
{
- if (0 == strncmp(resPayload->uri, OIC_RSRC_DOXM_URI, sizeof(OIC_RSRC_DOXM_URI)))
+ if (0 == strncmp(resPayload->uri, OIC_RSRC_DOXM_URI, strlen(OIC_RSRC_DOXM_URI)))
{
OIC_LOG_V(INFO,TAG,"resPaylod->uri:%s",resPayload->uri);
OIC_LOG(INFO, TAG, "Found doxm resource.");
char cwd[1024] = {0};
char svr_db_path[1024] = {0};
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(svr_db_path, "%s%s", cwd, SVR_DB_PATH);
+ snprintf(svr_db_path, sizeof(svr_db_path), "%s%s", cwd, SVR_DB_PATH);
return fopen(svr_db_path, mode);
}
//Delete previous PDB, if exist.
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(del_cmd, "rm -rf %stest.db", cwd);
+ snprintf(del_cmd, sizeof(del_cmd), "rm -rf %stest.db", cwd);
system(del_cmd);
//Delete previous SVR DB, if exist.
- sprintf(del_cmd, "rm -rf %s%s", cwd, SVR_DB_PATH);
+ snprintf(del_cmd, sizeof(del_cmd), "rm -rf %s%s", cwd, SVR_DB_PATH);
system(del_cmd);
//Generate default SVR DB.
- sprintf(svrdb_path, "%s%s", cwd, SVR_DB_PATH);
+ snprintf(svrdb_path, sizeof(svrdb_path), "%s%s", cwd, SVR_DB_PATH);
fp = fopen(svrdb_path, "w");
if(NULL != fp)
{
size_t numberItems = fwrite(DEFAULT_SVR_DB, 1, sizeof(DEFAULT_SVR_DB), fp);
- ASSERT_TRUE(sizeof(DEFAULT_SVR_DB) == numberItems);
fclose(fp);
+ ASSERT_TRUE(sizeof(DEFAULT_SVR_DB) == numberItems);
}
//Execute sample server to perform ownership transfer
int status2 = 0;
if(0 == (g_myPID1 = fork()))
{
- sprintf(server1_path, "%ssample_server1", cwd);
+ snprintf(server1_path, sizeof(server1_path), "%ssample_server1", cwd);
status1 = system(server1_path);
(void)status1;
}
if(0 == (g_myPID2 = fork()))
{
- sprintf(server2_path, "%ssample_server2", cwd);
+ snprintf(server2_path, sizeof(server2_path), "%ssample_server2", cwd);
status2= system(server2_path);
(void)status2;
}
//initialize Provisioning DB Manager
- sprintf(pdb_path, "%stest.db", cwd);
+ snprintf(pdb_path, sizeof(pdb_path), "%stest.db", cwd);
result = OCInitPM(pdb_path);
EXPECT_EQ(OC_STACK_OK, result);
tempDev = tempDev->next;
}
- EXPECT_EQ(2/*Server*/ + 1/*PT*/, NumOfOwnDevice);
+ EXPECT_EQ(2/*Server*/ , NumOfOwnDevice);
}
TEST(PerformLinkDevices, NullParam)
char cwd[1024] = {0};
char cred_path[1024] = {0};
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(cred_path, "%s%s", cwd, CRED_FILE);
+ snprintf(cred_path, sizeof(cred_path), "%s%s", cwd, CRED_FILE);
return fopen(cred_path, mode);
}
char del_cmd[1024] = {0};
FILE* fp = NULL;
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(del_cmd, "rm -rf %s%s", cwd, CRED_FILE);
+ snprintf(del_cmd, sizeof(del_cmd), "rm -rf %s%s", cwd, CRED_FILE);
system(del_cmd);
//Generate default SVR DB.
- sprintf(cred_path, "%s%s", cwd, CRED_FILE);
+ snprintf(cred_path, sizeof(cred_path), "%s%s", cwd, CRED_FILE);
fp = fopen(cred_path, "w");
if(NULL != fp)
{
char cwd[1024] = {0};
char cred_path[1024] = {0};
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(cred_path, "%s%s", cwd, CRED_FILE);
+ snprintf(cred_path, sizeof(cred_path), "%s%s", cwd, CRED_FILE);
return fopen(cred_path, mode);
}
char del_cmd[1024] = {0};
FILE* fp = NULL;
GetCurrentWorkingDirectory(cwd, sizeof(cwd));
- sprintf(del_cmd, "rm -rf %s%s", cwd, CRED_FILE);
+ snprintf(del_cmd, sizeof(del_cmd), "rm -rf %s%s", cwd, CRED_FILE);
system(del_cmd);
//Generate default SVR DB.
- sprintf(cred_path, "%s%s", cwd, CRED_FILE);
+ snprintf(cred_path, sizeof(cred_path), "%s%s", cwd, CRED_FILE);
fp = fopen(cred_path, "w");
if(NULL != fp)
{
receviedCred->privateData.data = (uint8_t *)OICCalloc(1, b64OutSize + 1);
VERIFY_NON_NULL(TAG, receviedCred->privateData.data, ERROR);
receviedCred->privateData.len = b64OutSize;
- strcpy((char*)receviedCred->privateData.data, b64Buf);
+ strncpy((char*)receviedCred->privateData.data, b64Buf, b64OutSize);
+ receviedCred->privateData.data[b64OutSize] = '\0';
}
else
{
{
result_length = -1;
OIC_LOG (ERROR, TAG, "Failed to memoray allocation.");
+ return ret;
}
if(B64_OK == b64Decode((char*)cred->privateData.data, cred->privateData.len, outKey, outBufSize, &outKeySize))