From 165e396fbb8c22f6010f7ad5ec54b9c15d69c52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 16 Apr 2024 09:37:37 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/core/ability/utils/src/file_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/ability/utils/src/file_utils.cpp b/services/core/ability/utils/src/file_utils.cpp index 801cc762..daebf53f 100644 --- a/services/core/ability/utils/src/file_utils.cpp +++ b/services/core/ability/utils/src/file_utils.cpp @@ -143,7 +143,7 @@ std::string FileUtils::GetParentDir(const std::string &fileDir) std::string FileUtils::GetCurrentDir(const std::string &fileDir) { // 兼容传递的文件夹路径，末尾带0-N个'/'均ok - if (fileDir.length() > 0 && fileDir[fileDir.length() - 1] == '/') { + if (fileDir.length() > 0 && fileDir.back() == '/') { return GetParentDir(fileDir); } return fileDir; -- Gitee From c7e517b4ef63c93fb9b8f754c62c485a735efdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 16 Apr 2024 11:40:03 +0000 Subject: [PATCH 2/5] codex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- foundations/ability/utils/include/json_builder.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/foundations/ability/utils/include/json_builder.h b/foundations/ability/utils/include/json_builder.h index fd7437cd..b4e0fcfe 100644 --- a/foundations/ability/utils/include/json_builder.h +++ b/foundations/ability/utils/include/json_builder.h @@ -69,12 +69,13 @@ public: JsonBuilder &Append(const std::string &key, const std::vector &valueList) { + std::vector::size_type valueListSize = valueList.size(); if (!valueList.empty()) { JsonBuilder jsonArray; jsonArray.Append("["); - for (size_t i = 0; i < valueList.size(); i++) { + for (size_t i = 0; i < valueListSize); i++) { jsonArray.Append(valueList[i].ToJson()); - if (i != valueList.size() - 1) { + if (i != valueListSize - 1) { jsonArray.Append(","); } } -- Gitee From a6f0319b15e158c3974958e629e9b1a22b226135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 16 Apr 2024 11:56:35 +0000 Subject: [PATCH 3/5] =?UTF-8?q?codex=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- .../utils/src/firmware_combine_version_utils.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/firmware/utils/src/firmware_combine_version_utils.cpp b/services/firmware/utils/src/firmware_combine_version_utils.cpp index b0247ce8..9385a895 100644 --- a/services/firmware/utils/src/firmware_combine_version_utils.cpp +++ b/services/firmware/utils/src/firmware_combine_version_utils.cpp @@ -82,11 +82,14 @@ void CombinePackageVersionUtils::HandleBaseVersionLog(std::string &baseVersion, std::string CombinePackageVersionUtils::HandleCustVersion(std::string &custVersion) { + if (custVersion.empty()) { + return ""; + } std::string::size_type mid = custVersion.find_last_of("("); std::string::size_type end = custVersion.find_last_of(")"); std::string::size_type start = custVersion.find_last_of("."); if ((start == std::string::npos) || (mid == std::string::npos) || (end == std::string::npos) || - end <= mid + 1 || mid <= start + 1) { + end <= mid + 1) || (mid <= start + 1) || (end >= INT_MAX) || (mid >= INT_MAX)) { return ""; } std::string cust = custVersion.substr(mid + 1, end - mid - 1); @@ -97,15 +100,18 @@ std::string CombinePackageVersionUtils::HandleCustVersion(std::string &custVersi std::string CombinePackageVersionUtils::HandlePreloadVersion(std::string &preloadVersion) { + if (preloadVersion.empty()) { + return ""; + } std::string::size_type start = preloadVersion.find_last_of("R"); std::string::size_type end = preloadVersion.find_last_of(")"); - if ((start == std::string::npos) || (end == std::string::npos) || (end <= start)) { + if ((start == std::string::npos) || (end == std::string::npos) || (end <= start) || (end >= INT_MAX)) { return ""; } std::string preload = preloadVersion.substr(start, end - start); start = preloadVersion.find_last_of("."); end = preloadVersion.find_last_of("("); - if ((start == std::string::npos) || (end == std::string::npos) || (end <= start + 1)) { + if ((start == std::string::npos) || (end == std::string::npos) || (end <= start + 1) || (end >= INT_MAX)) { return ""; } std::string getPnum = preloadVersion.substr(start + 1, end - start - 1); -- Gitee From ac1e92f9891e6d8e977bea3206c19f6a0f325c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 16 Apr 2024 11:59:01 +0000 Subject: [PATCH 4/5] codex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/firmware/utils/src/firmware_combine_version_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/firmware/utils/src/firmware_combine_version_utils.cpp b/services/firmware/utils/src/firmware_combine_version_utils.cpp index 9385a895..3e74c103 100644 --- a/services/firmware/utils/src/firmware_combine_version_utils.cpp +++ b/services/firmware/utils/src/firmware_combine_version_utils.cpp @@ -89,7 +89,7 @@ std::string CombinePackageVersionUtils::HandleCustVersion(std::string &custVersi std::string::size_type end = custVersion.find_last_of(")"); std::string::size_type start = custVersion.find_last_of("."); if ((start == std::string::npos) || (mid == std::string::npos) || (end == std::string::npos) || - end <= mid + 1) || (mid <= start + 1) || (end >= INT_MAX) || (mid >= INT_MAX)) { + (end <= mid + 1) || (mid <= start + 1) || (end >= INT_MAX) || (mid >= INT_MAX)) { return ""; } std::string cust = custVersion.substr(mid + 1, end - mid - 1); -- Gitee From 01d405f1f0decad9f00c69003eeb763273f751e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 16 Apr 2024 12:24:22 +0000 Subject: [PATCH 5/5] codex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- foundations/ability/utils/include/json_builder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/ability/utils/include/json_builder.h b/foundations/ability/utils/include/json_builder.h index b4e0fcfe..c00d28af 100644 --- a/foundations/ability/utils/include/json_builder.h +++ b/foundations/ability/utils/include/json_builder.h @@ -73,7 +73,7 @@ public: if (!valueList.empty()) { JsonBuilder jsonArray; jsonArray.Append("["); - for (size_t i = 0; i < valueListSize); i++) { + for (size_t i = 0; i < valueListSize; i++) { jsonArray.Append(valueList[i].ToJson()); if (i != valueListSize - 1) { jsonArray.Append(","); -- Gitee