From 64633d6b7dfeb7268f1f584f1e6fa1f03b9dfb5d Mon Sep 17 00:00:00 2001 From: "snickersun@163.com" Date: Mon, 12 Aug 2024 07:39:25 +0000 Subject: [PATCH] Merge #674 into sdk602patch0626 from refs/changes/674/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit release v1.1.31 * refs/changes/674/head: (2 commits squashed) - 修复安全漏洞 - Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: snickersun@163.com Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/674 --- .../wearable/service/ble_service/blemoder/bletest.cpp | 2 +- .../wearable/service/ble_service/bleservice/bleEvent.c | 7 ++++--- .../wearable/service/msg_center/src/msg_center_cmd.cpp | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index cc7b7226a..56caa029a 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -1096,7 +1096,7 @@ char * struct_to_json_buf_malloc_(uint8_t day) cJSON_Delete(dataJSON); return json_format; #else - return ""; + return NULL; #endif } #define TAR_PATH "user/tar" diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c index 3e185eeb0..9aad799a3 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -731,7 +731,7 @@ void getPhoneMac(uint8_t *data,uint8_t *phoneMac)//获取手机设备mac这个 cJSON_Delete(root); } else{ - memcpy(phoneMac,0,6); + memset(phoneMac,0,6); } } @@ -780,7 +780,7 @@ void GetwatchSaveMac(uint8_t *mac,uint8_t *mactype)//获取手表本地保存的 } } if(mac_tmp[0] == 0 && mac_tmp[1] == 0 && mac_tmp[2] == 0 && mac_tmp[3] == 0 && mac_tmp[4] == 0 && mac_tmp[5] == 0){ - memcpy(mac,0,6); + memset(mac,0,6); }else { memcpy(mac,mac_tmp,6); @@ -1861,7 +1861,7 @@ void SetDrinkSetParamCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalD if(Check_CRC(data,len,crcvalue)) { - msg_drink_info_t drink_info; + msg_drink_info_t drink_info={0}; drink_info.drink_on = data[0]; if(data[1]) { @@ -4456,6 +4456,7 @@ static void Send_json_Data_Cmd(uint8_t day,uint16_t pack_size,uint8_t id) break; } + if(json_format == NULL) return ; uint32_t data_len = strlen(json_format); uint32_t surplus_len=data_len; diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp index 945a33005..6490434de 100755 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp @@ -135,6 +135,8 @@ char *msg_center_get_bundle_name(uint8_t cmd_id) WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER,"msg_center_get_bundle_name: wrong cmd_id[%d]", cmd_id); break; } + + return NULL; } static errcode_t msg_center_pkt_dispatch(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) -- 2.17.1