From 0b272d39699c50b184eb343855853f57d6ae1a13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Mon, 14 Oct 2024 08:50:15 +0000 Subject: [PATCH] Merge #1186 into sdk602patch0911 from refs/changes/1186/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 消息解析增加安全保护 * refs/changes/1186/head: (1 commits squashed) - 消息解析增加安全保护 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1186 --- .../service/ble_service/bleservice/bleEvent.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 ef80c28c6..3f3b68717 100644 --- 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 printf("bigDataBufState:%d and sendbigDataBufState %d\r\n",bigDataBufState,sendbigDataBufState); #endif - if(Bleconnect == true ) + //if(Bleconnect == true ) { ret = svr_ble_bt_gatts_noyify(buf,len); } @@ -351,7 +351,7 @@ errcode_t sendBleData(uint8_t *buf,uint16_t len) void sendDataNow(uint8_t *buf,uint16_t len) { - if(Bleconnect == true ) + //if(Bleconnect == true ) { svr_ble_bt_gatts_noyify(buf,len); } @@ -6466,14 +6466,14 @@ uint8_t jscheck_ancs(uint8_t *data) int hasCode_t = 0; char *titleBuf; char *msgBuf; - titleBuf = ym_malloc(TITLE_BUF_LEN); - msgBuf = ym_malloc(MSG_BUF_LEN); + titleBuf = ym_malloc(TITLE_BUF_LEN+1); + msgBuf = ym_malloc(MSG_BUF_LEN+1); if(titleBuf == NULL || msgBuf == NULL)//申请内存失败不在申请 { return 2; } - memset(titleBuf,0,TITLE_BUF_LEN); - memset(msgBuf,0,MSG_BUF_LEN); + memset(titleBuf,0,TITLE_BUF_LEN+1); + memset(msgBuf,0,MSG_BUF_LEN+1); cJSON* uid = cJSON_GetObjectItem(root, "uid"); if (uid && cJSON_IsNumber(uid)) { printf("uid_t: %d\n", uid->valueint); @@ -6495,7 +6495,7 @@ uint8_t jscheck_ancs(uint8_t *data) title_c->valuestring[len++] = '.'; title_c->valuestring[len++] = 0; } - memcpy(titleBuf,(uint8_t *)title_c->valuestring,len); + memcpy_s(titleBuf,TITLE_BUF_LEN,(uint8_t *)title_c->valuestring,len); } cJSON* msg = cJSON_GetObjectItem(root, "msg"); if (msg && cJSON_IsString(msg)) { @@ -6507,7 +6507,7 @@ uint8_t jscheck_ancs(uint8_t *data) msg->valuestring[len++] = '.'; msg->valuestring[len++] = 0; } - memcpy(msgBuf,(uint8_t *)msg->valuestring,len); + memcpy_s(msgBuf,MSG_BUF_LEN,(uint8_t *)msg->valuestring,len); printf("msgBuf: %s\n",msgBuf); } cJSON* time = cJSON_GetObjectItem(root, "time"); -- 2.17.1