From: hcj <1224667075@qq.com> Date: Sun, 20 Oct 2024 03:26:08 +0000 (+0800) Subject: 修改获取全部表盘id接口防止越界 X-Git-Tag: fd230_release_V1.3.102~193^2~1^2~21 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=76e8803a68b6c45a8c757725188f02335d49dedc;p=mirrors%2FFD230.git 修改获取全部表盘id接口防止越界 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h index e9d7020dd..50119e2a0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h @@ -53,7 +53,7 @@ namespace OHOS void UpdateDialSetting(uint16_t ID); uint16_t GetDialIdFromName(const std::string &dialName); void PrintRegisteredDials(const std::unordered_map &dials); - int GetAllDialIDs(char *allidStr); + int GetAllDialIDs(char *allidStr,uint16_t MAX_LEN); /*表盘map文件*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp index d304da62e..a6cc799c5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp @@ -184,7 +184,7 @@ uint16_t SetDialModel::GetCurrentDialID() { return id; } /* 获取所有表盘Id 每个表盘Id 2个字节 拼接为字符串 */ -int SetDialModel::GetAllDialIDs(char *allidStr) { +int SetDialModel::GetAllDialIDs(char *allidStr,uint16_t MAX_LEN) { std::string allIDs; int length = 0; for (const auto &entry : registeredDials) { @@ -192,6 +192,7 @@ int SetDialModel::GetAllDialIDs(char *allidStr) { if (id <= 5) { id--; } + if(length