From 2533fdd50e35b379dcad49489d54eda6179580cc Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 17 Jul 2020 19:00:41 +0800 Subject: [PATCH] Update osal_os.c strncpy(version, ver, IOTX_FIRMWARE_VER_LEN) -> strncpy(version, ver, len); --- .../port/TencentOS_tiny/osal_os.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/connectivity/iotkit-embedded-3.0.1/port/TencentOS_tiny/osal_os.c b/components/connectivity/iotkit-embedded-3.0.1/port/TencentOS_tiny/osal_os.c index 13fa4ea6..0eb97553 100644 --- a/components/connectivity/iotkit-embedded-3.0.1/port/TencentOS_tiny/osal_os.c +++ b/components/connectivity/iotkit-embedded-3.0.1/port/TencentOS_tiny/osal_os.c @@ -173,7 +173,7 @@ int HAL_GetFirmwareVersion(char *version) char *ver = "app-1.0.0-20180101.1000"; int len = strlen(ver); memset(version, 0x0, IOTX_FIRMWARE_VER_LEN); - strncpy(version, ver, IOTX_FIRMWARE_VER_LEN); + strncpy(version, ver, len); version[len] = '\0'; return strlen(version); } @@ -190,7 +190,7 @@ void *HAL_MutexCreate(void) void HAL_MutexDestroy(void *mutex) { - k_err_t ret; + k_err_t ret; if (K_ERR_NONE != (ret = tos_mutex_destroy((k_mutex_t *)mutex))) { HAL_Printf("osal_mutex_destroy err, err:%d\n\r", ret); @@ -210,16 +210,16 @@ void HAL_MutexLock(void *mutex) void HAL_MutexUnlock(void *mutex) { - k_err_t ret; + k_err_t ret; - if (K_ERR_NONE != (ret = tos_mutex_post((k_mutex_t *)mutex))) { - HAL_Printf("osal_mutex_unlock err, err:%d\n\r", ret); - } + if (K_ERR_NONE != (ret = tos_mutex_post((k_mutex_t *)mutex))) { + HAL_Printf("osal_mutex_unlock err, err:%d\n\r", ret); + } } void *HAL_Malloc(uint32_t size) { - return tos_mmheap_alloc(size); + return tos_mmheap_alloc(size); } void HAL_Free(void *ptr) -- GitLab