yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

非安全函数告警清理 

Signed-off-by: xuxinyu <xuxinyu6@huawei.com>
Change-Id: I45bbaa3568be3679b34b1e8b072d19d878fdbf02
This commit is contained in:
xuxinyu 2022-08-25 20:50:48 +08:00
parent 14e64fc89b
commit a0b776a709
7 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/dynlink/los_dynlink.c
View File

@ -279,7 +279,7 @@ STATIC DynSharedObj *OsLoadInit(const CHAR *fileName, VOID *pool)
goto ERR2; goto ERR2;
} }
strcpy(dso->buf, fileName); (void)strcpy_s(dso->buf, nameLen + 1, fileName);
dso->fileName = dso->buf; dso->fileName = dso->buf;
dso->ref = 1; dso->ref = 1;
dso->pool = (pool ? pool : OS_SYS_MEM_ADDR); dso->pool = (pool ? pool : OS_SYS_MEM_ADDR);

24
testsuites/sample/cmsis/cmsis_func_test.c
View File

@ -85,14 +85,12 @@ EXIT:
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1)
{ {
osMessageQueueId_t msgQueueId; osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world"; CHAR strbuff[] = "hello world";
CHAR *name = NULL; CHAR *name = NULL;
INT32 ret; INT32 ret;
memset(&attr, 0, sizeof(attr));
attr.name = "q1"; attr.name = "q1";
/* dynamic test */ /* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr); msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr);
@ -179,11 +177,9 @@ static VOID CmsisQueueTestThread2(VOID)
static INT32 ThreadReadWriteTest(VOID) static INT32 ThreadReadWriteTest(VOID)
{ {
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
INT32 ret; INT32 ret;
memset(&attr, 0, sizeof(attr));
g_msgQueueId1 = osMessageQueueNew(1, strlen(g_strbuff1), NULL); g_msgQueueId1 = osMessageQueueNew(1, strlen(g_strbuff1), NULL);
ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId1, NULL, g_msgQueueId1); 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) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis005, Function | MediumTest | Level1)
{ {
osMessageQueueId_t msgQueueId; osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world"; CHAR strbuff[] = "hello world";
CHAR data[STATCI_BUFF_SIZE] = {0}; CHAR data[STATCI_BUFF_SIZE] = {0};
INT32 ret; INT32 ret;
memset(&attr, 0, sizeof(attr));
ret = osMessageQueuePut(NULL, &strbuff, 0U, 0U); ret = osMessageQueuePut(NULL, &strbuff, 0U, 0U);
ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret); ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret);
@ -297,14 +291,12 @@ EXIT:
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1)
{ {
osMessageQueueId_t msgQueueId; osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world"; CHAR strbuff[] = "hello world";
CHAR data[STATCI_BUFF_SIZE] = {0}; CHAR data[STATCI_BUFF_SIZE] = {0};
INT32 ret; INT32 ret;
memset(&attr, 0, sizeof(attr));
/* dynamic test */ /* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL); msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
@ -356,12 +348,10 @@ EXIT:
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1)
{ {
osMessageQueueId_t msgQueueId; osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world"; CHAR strbuff[] = "hello world";
memset(&attr, 0, sizeof(attr));
/* dynmic test */ /* dynmic test */
msgQueueId = osMessageQueueNew(0, strlen(strbuff), NULL); msgQueueId = osMessageQueueNew(0, strlen(strbuff), NULL);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId); 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) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis002, Function | MediumTest | Level1)
{ {
osMessageQueueId_t msgQueueId; osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr; osMessageQueueAttr_t attr = {0};
CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world"; CHAR strbuff[] = "hello world";
INT32 ret; INT32 ret;
memset(&attr, 0, sizeof(attr));
/* dynamic test */ /* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL); msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);

6
testsuites/sample/kernel/atomic/it_los_atomic_007.c
View File

@ -61,8 +61,10 @@ static UINT32 TestCase(VOID)
g_testAtomicID05 = 0; g_testAtomicID05 = 0;
for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) { for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) {
memset(buf, 0, 10); // max buf size is 10. ret = memset_s(buf, 10, 0, 10); // max buf size is 10.
memset(taskName[i], 0, 20); // max taskName size is 20. 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].pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task[i].pcName = taskName[i]; task[i].pcName = taskName[i];

7
testsuites/sample/kernel/atomic/it_los_atomic_008.c
View File

@ -62,9 +62,10 @@ static UINT32 TestCase(VOID)
g_testAtomicID05 = 0; g_testAtomicID05 = 0;
for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) { for (i = 0; i < ATOMIC_MUTI_TASK_NUM; i++) {
memset(buf, 0, 10); // max buf size is 10. ret = memset_s(buf, 10, 0, 10); // max buf size is 10.
memset(taskName[i], 0, 20); // max taskName size is 20. 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].pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task[i].pcName = taskName[i]; task[i].pcName = taskName[i];
task[i].uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task[i].uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;

6
testsuites/sample/kernel/atomic/it_los_atomic_009.c
View File

@ -77,8 +77,10 @@ static UINT32 TestCase(VOID)
} }
for (i = 0; i < uLoop; i++) { for (i = 0; i < uLoop; i++) {
memset(buf, 0, 10); // max buf size is 10. ret = memset_s(buf, 10, 0, 10); // max buf size is 10.
memset(taskName[i], 0, 20); // max taskName size is 20. 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. if (i % 2 == 0) { // 2 is index.
uCount++; uCount++;

2
testsuites/sample/kernel/lms/It_los_lms_018.c
View File

@ -40,7 +40,7 @@ static UINT32 TestCase(VOID)
src = LOS_MemAlloc(m_aucSysMem0, 9); src = LOS_MemAlloc(m_aucSysMem0, 9);
ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src); ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src);
(VOID)memset(src, 0, 9); (void)memset_s(src, 9, 0, 9);
src[0] = 49; src[0] = 49;
src[1] = 50; src[1] = 50;
src[2] = 51; src[2] = 51;

2
testsuites/sample/kernel/lms/It_los_lms_019.c
View File

@ -40,7 +40,7 @@ static UINT32 TestCase(VOID)
src = LOS_MemAlloc(m_aucSysMem0, 9); src = LOS_MemAlloc(m_aucSysMem0, 9);
ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src); ICUNIT_ASSERT_NOT_EQUAL(src, NULL, src);
(VOID)memset(src, 0, 9); (void)memset_s(src, 9, 0, 9);
src[0] = 49; src[0] = 49;
src[1] = 50; src[1] = 50;
src[2] = 51; src[2] = 51;