Merge #674 into sdk602patch0626 from refs/changes/674/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/674

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 cc7b722..56caa02 100644 (file)
--- 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 3e185ee..9aad799 100644 (file)
--- 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);\r
     } \r
     else{\r
-        memcpy(phoneMac,0,6);\r
+        memset(phoneMac,0,6);\r
     }\r
 }\r
 \r
@@ -780,7 +780,7 @@ void GetwatchSaveMac(uint8_t *mac,uint8_t *mactype)//获取手表本地保存的
             }\r
         }\r
         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){\r
-            memcpy(mac,0,6);\r
+            memset(mac,0,6);\r
         }else\r
         {\r
             memcpy(mac,mac_tmp,6);\r
@@ -1861,7 +1861,7 @@ void SetDrinkSetParamCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalD
 \r
        if(Check_CRC(data,len,crcvalue))\r
        {\r
-        msg_drink_info_t drink_info;\r
+        msg_drink_info_t drink_info={0};\r
         drink_info.drink_on = data[0];\r
         if(data[1])\r
         {\r
@@ -4456,6 +4456,7 @@ static void Send_json_Data_Cmd(uint8_t day,uint16_t pack_size,uint8_t id)
                 break;\r
         }\r
        \r
+        if(json_format == NULL) return ;\r
 \r
         uint32_t data_len = strlen(json_format);\r
         uint32_t surplus_len=data_len;\r

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 945a330..6490434 100755 (executable)
--- 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)