From 632ea1041833479f32cd16bcec5ef2804eb3d436 Mon Sep 17 00:00:00 2001 From: x_xiny <1301913191@qq.com> Date: Thu, 10 Mar 2022 16:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20fix:=E5=86=85=E6=BA=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A3=80=E8=A7=86=E4=BF=AE=E6=94=B9=20=20=20=20=20?= =?UTF-8?q?=E3=80=90=E8=83=8C=E6=99=AF=E3=80=913.1=E4=BB=A3=E7=A0=81review?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【修改方案】 re #I4WV56 Signed-off-by: xuiny Change-Id: I1f3d98ab84b739c5d3a924559b1825659dc0ea74 --- components/net/lwip-2.1/porting/src/api_shell.c | 3 +-- testsuites/sample/kernel/lms/It_los_lms_020.c | 4 ++-- testsuites/sample/kernel/lms/It_los_lms_021.c | 2 +- testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c | 2 +- testsuites/unittest/fuzz/src/socket/net_fuzz.c | 4 ++-- testsuites/unittest/posix/src/string/string_func_test_03.c | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/components/net/lwip-2.1/porting/src/api_shell.c b/components/net/lwip-2.1/porting/src/api_shell.c index 161b237d..d72775e6 100644 --- a/components/net/lwip-2.1/porting/src/api_shell.c +++ b/components/net/lwip-2.1/porting/src/api_shell.c @@ -527,7 +527,7 @@ static void ping_cmd(u32_t *parg) if (ret < 0) { PRINTK("Ping cmd failed due to some errors\n"); } - + free(parg); ping_taskid = -1; } @@ -589,7 +589,6 @@ u32_t OsShellPing(int argc, const char **argv) stPingTask.uwArg = (UINTPTR)parg; ret = LOS_TaskCreate((UINT32 *)(&ping_taskid), &stPingTask); if (ret != LOS_OK) { - free(parg); PRINTK("ping_task create failed 0x%08x.\n", ret); count = LWIP_SHELL_CMD_PING_RETRY_TIMES; } else { diff --git a/testsuites/sample/kernel/lms/It_los_lms_020.c b/testsuites/sample/kernel/lms/It_los_lms_020.c index 16719d2a..add0077a 100644 --- a/testsuites/sample/kernel/lms/It_los_lms_020.c +++ b/testsuites/sample/kernel/lms/It_los_lms_020.c @@ -36,9 +36,9 @@ static UINT32 TestCase(VOID) { CHAR *p = (CHAR *)LOS_MemAlloc(g_testLmsPool, INDEX_MAX); ICUNIT_ASSERT_NOT_EQUAL(p, NULL, 0); - memset_s(p, INDEX_MAX, 0, INDEX_MAX + 1); + (void)memset_s(p, INDEX_MAX, 0, INDEX_MAX + 1); PRINTK("p[0] = %d\n", p[0]); - memset_s(p, INDEX_MAX + 1, 0, INDEX_MAX + 1); /* trigger overflow */ + (void)memset_s(p, INDEX_MAX + 1, 0, INDEX_MAX + 1); /* trigger overflow */ return LOS_OK; } diff --git a/testsuites/sample/kernel/lms/It_los_lms_021.c b/testsuites/sample/kernel/lms/It_los_lms_021.c index dd6895e4..08195fc7 100644 --- a/testsuites/sample/kernel/lms/It_los_lms_021.c +++ b/testsuites/sample/kernel/lms/It_los_lms_021.c @@ -40,7 +40,7 @@ static UINT32 TestCase(VOID) memcpy_s(p, INDEX_MAX, src, INDEX_MAX + 1); PRINTK("p[0] = %d\n", p[0]); - memcpy_s(p, INDEX_MAX + 1, 0, INDEX_MAX + 1); /* trigger overflow */ + (void)memcpy_s(p, INDEX_MAX + 1, 0, INDEX_MAX + 1); /* trigger overflow */ return LOS_OK; } diff --git a/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c b/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c index 0d5b76a9..9695f989 100644 --- a/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c +++ b/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c @@ -65,7 +65,7 @@ void SemTimedWaitFuzzTest(void) absTimeout.tv_sec = (*(int *)DT_SetGetS32(&g_element[elemSecIndex], 0)) % SEC_MODE_VALUE; absTimeout.tv_nsec = (*(int *)DT_SetGetS32(&g_element[elemNsecIndex], 0) % NSEC_MODE_VALUE); - memset_s(&sem, sizeof(sem), 0, sizeof(sem_t)); + (void)memset_s(&sem, sizeof(sem), 0, sizeof(sem_t)); pshared = (*(int *)DT_SetGetS32(&g_element[1], DEFAULT_SHARED_VALUE)); value = (*(unsigned int *)DT_SetGetU32(&g_element[1], 0)) % MAX_SEM_VALUE; sem_init(&sem, pshared, value); diff --git a/testsuites/unittest/fuzz/src/socket/net_fuzz.c b/testsuites/unittest/fuzz/src/socket/net_fuzz.c index e702c084..320c7570 100644 --- a/testsuites/unittest/fuzz/src/socket/net_fuzz.c +++ b/testsuites/unittest/fuzz/src/socket/net_fuzz.c @@ -123,7 +123,7 @@ static void *SampleUdpClient() clnAddr.sin_port = htons(g_udpPort); printf("c3\r\n"); - strcpy_s(buf, sizeof(buf), UDPMSG); + (void)strcpy_s(buf, sizeof(buf), UDPMSG); usleep(sleepSec); printf("c4, %s, %d\r\n", buf, strlen(buf)); @@ -266,7 +266,7 @@ static void *SampleTcpClient() if (err != EOK) { return (void *)(intptr_t)ret; } - strcpy_s(buf, sizeof(buf), CLI_MSG); + (void)strcpy_s(buf, sizeof(buf), CLI_MSG); int num2 = *(int *)DT_SetGetS32(&g_element[1], 0); send(num1, buf, strlen(CLI_MSG), num2); diff --git a/testsuites/unittest/posix/src/string/string_func_test_03.c b/testsuites/unittest/posix/src/string/string_func_test_03.c index 658babe4..9b381fbd 100644 --- a/testsuites/unittest/posix/src/string/string_func_test_03.c +++ b/testsuites/unittest/posix/src/string/string_func_test_03.c @@ -211,7 +211,7 @@ LITE_TEST_CASE(PosixStringFuncTestSuite, testStrStrcspn002, Function | MediumTes LITE_TEST_CASE(PosixStringFuncTestSuite, testStrStrptime001, Function | MediumTest | Level1) { struct tm tmData; - memset_s(&tmData, sizeof(struct tm), 0, sizeof(struct tm)); + (void)memset_s(&tmData, sizeof(struct tm), 0, sizeof(struct tm)); char *ret = strptime("2020-10-29 21:24:00abc", "%Y-%m-%d %H:%M:%S", &tmData); TEST_ASSERT_EQUAL_CHAR_ARRAY(ret, "abc", 3); TEST_ASSERT_EQUAL_INT(tmData.tm_year, 120);