From a0b776a709218963c61b9508199e3f2d52f5b713 Mon Sep 17 00:00:00 2001 From: xuxinyu Date: Thu, 25 Aug 2022 20:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=AE=89=E5=85=A8=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuxinyu Change-Id: I45bbaa3568be3679b34b1e8b072d19d878fdbf02 --- components/dynlink/los_dynlink.c | 2 +- testsuites/sample/cmsis/cmsis_func_test.c | 24 +++++-------------- .../sample/kernel/atomic/it_los_atomic_007.c | 6 +++-- .../sample/kernel/atomic/it_los_atomic_008.c | 7 +++--- .../sample/kernel/atomic/it_los_atomic_009.c | 6 +++-- testsuites/sample/kernel/lms/It_los_lms_018.c | 2 +- testsuites/sample/kernel/lms/It_los_lms_019.c | 2 +- 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/components/dynlink/los_dynlink.c b/components/dynlink/los_dynlink.c index 8d503a85..1da9fe0c 100644 --- a/components/dynlink/los_dynlink.c +++ b/components/dynlink/los_dynlink.c @@ -279,7 +279,7 @@ STATIC DynSharedObj *OsLoadInit(const CHAR *fileName, VOID *pool) goto ERR2; } - strcpy(dso->buf, fileName); + (void)strcpy_s(dso->buf, nameLen + 1, fileName); dso->fileName = dso->buf; dso->ref = 1; dso->pool = (pool ? pool : OS_SYS_MEM_ADDR); diff --git a/testsuites/sample/cmsis/cmsis_func_test.c b/testsuites/sample/cmsis/cmsis_func_test.c index f1c589f7..fb5dc6ed 100644 --- a/testsuites/sample/cmsis/cmsis_func_test.c +++ b/testsuites/sample/cmsis/cmsis_func_test.c @@ -85,14 +85,12 @@ EXIT: LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR *name = NULL; INT32 ret; - memset(&attr, 0, sizeof(attr)); - attr.name = "q1"; /* dynamic test */ msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr); @@ -179,11 +177,9 @@ static VOID CmsisQueueTestThread2(VOID) static INT32 ThreadReadWriteTest(VOID) { - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; INT32 ret; - memset(&attr, 0, sizeof(attr)); - g_msgQueueId1 = osMessageQueueNew(1, strlen(g_strbuff1), NULL); ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId1, NULL, g_msgQueueId1); @@ -228,14 +224,12 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis006, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis005, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR data[STATCI_BUFF_SIZE] = {0}; INT32 ret; - memset(&attr, 0, sizeof(attr)); - ret = osMessageQueuePut(NULL, &strbuff, 0U, 0U); ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret); @@ -297,14 +291,12 @@ EXIT: LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR data[STATCI_BUFF_SIZE] = {0}; INT32 ret; - memset(&attr, 0, sizeof(attr)); - /* dynamic test */ msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); @@ -356,12 +348,10 @@ EXIT: LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; - memset(&attr, 0, sizeof(attr)); - /* dynmic test */ msgQueueId = osMessageQueueNew(0, strlen(strbuff), NULL); ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId); @@ -397,13 +387,11 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis002, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr; + osMessageQueueAttr_t attr = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; INT32 ret; - memset(&attr, 0, sizeof(attr)); - /* dynamic test */ msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_007.c b/testsuites/sample/kernel/atomic/it_los_atomic_007.c index 05f9f62a..08a6cdc8 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_007.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_007.c @@ -61,8 +61,10 @@ static UINT32 TestCase(VOID) g_testAtomicID05 = 0; for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) { - memset(buf, 0, 10); // max buf size is 10. - memset(taskName[i], 0, 20); // max taskName size is 20. + ret = memset_s(buf, 10, 0, 10); // max buf size is 10. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + ret = memset_s(taskName[i], 20, 0, 20); // max taskName size is 20. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); task[i].pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task[i].pcName = taskName[i]; diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_008.c b/testsuites/sample/kernel/atomic/it_los_atomic_008.c index 02c4b291..d643a272 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_008.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_008.c @@ -62,9 +62,10 @@ static UINT32 TestCase(VOID) g_testAtomicID05 = 0; for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) { - memset(buf, 0, 10); // max buf size is 10. - memset(taskName[i], 0, 20); // max taskName size is 20. - + ret = memset_s(buf, 10, 0, 10); // max buf size is 10. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + ret = memset_s(taskName[i], 20, 0, 20); // max taskName size is 20. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); task[i].pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task[i].pcName = taskName[i]; task[i].uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_009.c b/testsuites/sample/kernel/atomic/it_los_atomic_009.c index d578fb9b..5cd79427 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_009.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_009.c @@ -77,8 +77,10 @@ static UINT32 TestCase(VOID) } for (i = 0; i < uLoop; i++) { - memset(buf, 0, 10); // max buf size is 10. - memset(taskName[i], 0, 20); // max taskName size is 20. + ret = memset_s(buf, 10, 0, 10); // max buf size is 10. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + ret = memset_s(taskName[i], 20, 0, 20); // max taskName size is 20. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); if (i % 2 == 0) { // 2 is index. uCount++; diff --git a/testsuites/sample/kernel/lms/It_los_lms_018.c b/testsuites/sample/kernel/lms/It_los_lms_018.c index 34976f3b..b078ec4a 100644 --- a/testsuites/sample/kernel/lms/It_los_lms_018.c +++ b/testsuites/sample/kernel/lms/It_los_lms_018.c @@ -40,7 +40,7 @@ static UINT32 TestCase(VOID) src = LOS_MemAlloc(m_aucSysMem0, 9); ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src); - (VOID)memset(src, 0, 9); + (void)memset_s(src, 9, 0, 9); src[0] = 49; src[1] = 50; src[2] = 51; diff --git a/testsuites/sample/kernel/lms/It_los_lms_019.c b/testsuites/sample/kernel/lms/It_los_lms_019.c index 6bc98370..9e6ff243 100644 --- a/testsuites/sample/kernel/lms/It_los_lms_019.c +++ b/testsuites/sample/kernel/lms/It_los_lms_019.c @@ -40,7 +40,7 @@ static UINT32 TestCase(VOID) src = LOS_MemAlloc(m_aucSysMem0, 9); ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src); - (VOID)memset(src, 0, 9); + (void)memset_s(src, 9, 0, 9); src[0] = 49; src[1] = 50; src[2] = 51;