From e3d085263db6be992c9feaa999b649ea5a82c3fe Mon Sep 17 00:00:00 2001 From: yanhuan Date: Sat, 12 Apr 2025 14:10:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanhuan --- packing_tool/frameworks/src/package_normalize.cpp | 8 +++++++- packing_tool/frameworks/src/version_normalize.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index a116c0ef..c65a9f58 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -122,7 +122,13 @@ int32_t PackageNormalize::Process() std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH); std::string tempPath = outPath + Constants::LINUX_FILE_SEPARATOR + Constants::COMPRESSOR_PACKAGENORMALIZE_TEMP_DIR + Utils::GenerateUUID(); - int32_t versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + int32_t versionCode = 0; + try { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } catch (...) { + LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); + return false; + } std::string bundleName = parameterMap_.at(Constants::PARAM_BUNDLE_NAME); for (const std::string &path : hspList_) { if (ZipUtils::Unzip(path, tempPath) != ZIP_ERR_SUCCESS) { diff --git a/packing_tool/frameworks/src/version_normalize.cpp b/packing_tool/frameworks/src/version_normalize.cpp index 4fbd3a8b..303303c9 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -266,7 +266,13 @@ int32_t VersionNormalize::Process() std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH); std::string tempPath = outPath + Constants::LINUX_FILE_SEPARATOR + Constants::COMPRESSOR_VERSIONNORMALIZE_TEMP_DIR + Utils::GenerateUUID(); - int32_t versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + int32_t versionCode = 0; + try { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } catch (...) { + LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); + return false; + } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee From 05b87957e18a81f34bfa063101cc5931d4a9bb7c Mon Sep 17 00:00:00 2001 From: yanhuan Date: Sat, 12 Apr 2025 14:48:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanhuan --- packing_tool/frameworks/src/package_normalize.cpp | 2 +- packing_tool/frameworks/src/version_normalize.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index c65a9f58..597b16d2 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -126,7 +126,7 @@ int32_t PackageNormalize::Process() try { versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); } catch (...) { - LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); + LOGE("stoi(%{public}s) failed", Constants::PARAM_VERSION_CODE); return false; } std::string bundleName = parameterMap_.at(Constants::PARAM_BUNDLE_NAME); diff --git a/packing_tool/frameworks/src/version_normalize.cpp b/packing_tool/frameworks/src/version_normalize.cpp index 303303c9..34db021a 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -270,7 +270,7 @@ int32_t VersionNormalize::Process() try { versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); } catch (...) { - LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); + LOGE("stoi(%{public}s) failed", Constants::PARAM_VERSION_CODE); return false; } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); -- Gitee From e03fb73c9aac2be26c406dfe26346fe6c6209cea Mon Sep 17 00:00:00 2001 From: yanhuan Date: Sat, 12 Apr 2025 15:31:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanhuan --- packing_tool/frameworks/src/package_normalize.cpp | 2 +- packing_tool/frameworks/src/version_normalize.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index 597b16d2..0bcde699 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -126,7 +126,7 @@ int32_t PackageNormalize::Process() try { versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); } catch (...) { - LOGE("stoi(%{public}s) failed", Constants::PARAM_VERSION_CODE); + LOGE("stoi failed."); return false; } std::string bundleName = parameterMap_.at(Constants::PARAM_BUNDLE_NAME); diff --git a/packing_tool/frameworks/src/version_normalize.cpp b/packing_tool/frameworks/src/version_normalize.cpp index 34db021a..cc673f09 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -270,8 +270,7 @@ int32_t VersionNormalize::Process() try { versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); } catch (...) { - LOGE("stoi(%{public}s) failed", Constants::PARAM_VERSION_CODE); - return false; + LOGE("stoi failed."); } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee