消息解析增加安全保护

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 ef80c28..3f3b687 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -341,7 +341,7 @@ errcode_t sendBleData(uint8_t *buf,uint16_t len)
     #ifdef BLE_LOG\r
         printf("bigDataBufState:%d and  sendbigDataBufState %d\r\n",bigDataBufState,sendbigDataBufState);\r
     #endif\r
-    if(Bleconnect == true )\r
+    //if(Bleconnect == true )\r
     {\r
         ret = svr_ble_bt_gatts_noyify(buf,len);\r
     }\r
@@ -351,7 +351,7 @@ errcode_t sendBleData(uint8_t *buf,uint16_t len)
 \r
 void sendDataNow(uint8_t *buf,uint16_t len)\r
 {\r
-    if(Bleconnect == true )\r
+    //if(Bleconnect == true )\r
     {\r
         svr_ble_bt_gatts_noyify(buf,len);\r
     }\r
@@ -6466,14 +6466,14 @@ uint8_t jscheck_ancs(uint8_t *data)
     int hasCode_t = 0;\r
     char *titleBuf;\r
     char *msgBuf;\r
-    titleBuf = ym_malloc(TITLE_BUF_LEN);\r
-    msgBuf = ym_malloc(MSG_BUF_LEN);\r
+    titleBuf = ym_malloc(TITLE_BUF_LEN+1);\r
+    msgBuf = ym_malloc(MSG_BUF_LEN+1);\r
     if(titleBuf == NULL || msgBuf == NULL)//申请内存失败不在申请\r
     {\r
         return 2;\r
     }\r
-    memset(titleBuf,0,TITLE_BUF_LEN);\r
-    memset(msgBuf,0,MSG_BUF_LEN);\r
+    memset(titleBuf,0,TITLE_BUF_LEN+1);\r
+    memset(msgBuf,0,MSG_BUF_LEN+1);\r
     cJSON* uid = cJSON_GetObjectItem(root, "uid");\r
     if (uid && cJSON_IsNumber(uid)) {\r
         printf("uid_t: %d\n", uid->valueint);\r
@@ -6495,7 +6495,7 @@ uint8_t jscheck_ancs(uint8_t *data)
             title_c->valuestring[len++] = '.';\r
             title_c->valuestring[len++] = 0;\r
         }\r
-        memcpy(titleBuf,(uint8_t *)title_c->valuestring,len);\r
+        memcpy_s(titleBuf,TITLE_BUF_LEN,(uint8_t *)title_c->valuestring,len);\r
     }\r
     cJSON* msg = cJSON_GetObjectItem(root, "msg");\r
     if (msg && cJSON_IsString(msg)) {\r
@@ -6507,7 +6507,7 @@ uint8_t jscheck_ancs(uint8_t *data)
             msg->valuestring[len++] = '.';\r
             msg->valuestring[len++] = 0;\r
         }\r
-        memcpy(msgBuf,(uint8_t *)msg->valuestring,len);\r
+        memcpy_s(msgBuf,MSG_BUF_LEN,(uint8_t *)msg->valuestring,len);\r
         printf("msgBuf: %s\n",msgBuf);\r
     }\r
     cJSON* time = cJSON_GetObjectItem(root, "time");\r