From 2b3f55b6902cd6c667e6e73ef47a62b75b1e6404 Mon Sep 17 00:00:00 2001 From: yanhuan Date: Fri, 11 Apr 2025 14:04:10 +0800 Subject: [PATCH 1/4] =?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 | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index a116c0ef..d6acc3a6 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -122,6 +122,14 @@ 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; + try { + if (std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE))) { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } + } catch (const std::regex_error& e) { + return false; + } int32_t versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); std::string bundleName = parameterMap_.at(Constants::PARAM_BUNDLE_NAME); for (const std::string &path : hspList_) { diff --git a/packing_tool/frameworks/src/version_normalize.cpp b/packing_tool/frameworks/src/version_normalize.cpp index 4fbd3a8b..0f0271e9 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -266,7 +266,14 @@ 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; + try { + if (std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE))) { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } + } catch (const std::regex_error& e) { + return false; + } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee From acf0d5fb29ce59e2c9c5204be63fc5364e2ae07b Mon Sep 17 00:00:00 2001 From: yanhuan Date: Fri, 11 Apr 2025 14:20:37 +0800 Subject: [PATCH 2/4] =?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 | 1 - 1 file changed, 1 deletion(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index d6acc3a6..47fd0d1d 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -130,7 +130,6 @@ int32_t PackageNormalize::Process() } catch (const std::regex_error& e) { return false; } - int32_t versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); std::string bundleName = parameterMap_.at(Constants::PARAM_BUNDLE_NAME); for (const std::string &path : hspList_) { if (ZipUtils::Unzip(path, tempPath) != ZIP_ERR_SUCCESS) { -- Gitee From e08df434567133c7d88c9558659cfed626f85a92 Mon Sep 17 00:00:00 2001 From: yanhuan Date: Sat, 12 Apr 2025 13:51:04 +0800 Subject: [PATCH 3/4] =?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 | 9 ++++----- packing_tool/frameworks/src/version_normalize.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index 47fd0d1d..fe7f81bf 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -122,12 +122,11 @@ 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; + int32_t versionCode = 0; try { - if (std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE))) { - versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); - } - } catch (const std::regex_error& e) { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } catch (...) { + TAG_LOGW(AAFwkTag::DIALOG, "stoi(%{public}s) failed", uriVec[index++].c_str()); 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 0f0271e9..649a02e2 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -266,12 +266,11 @@ 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; + int32_t versionCode = 0; try { - if (std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE))) { - versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); - } - } catch (const std::regex_error& e) { + versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); + } catch (...) { + TAG_LOGW(AAFwkTag::DIALOG, "stoi(%{public}s) failed", uriVec[index++].c_str()); return false; } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); -- Gitee From 0782254088670fb416fbfe1c4a93d1fd3edf32eb Mon Sep 17 00:00:00 2001 From: yanhuan Date: Sat, 12 Apr 2025 14:04:58 +0800 Subject: [PATCH 4/4] =?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 fe7f81bf..c65a9f58 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 (...) { - TAG_LOGW(AAFwkTag::DIALOG, "stoi(%{public}s) failed", uriVec[index++].c_str()); + LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); 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 649a02e2..303303c9 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 (...) { - TAG_LOGW(AAFwkTag::DIALOG, "stoi(%{public}s) failed", uriVec[index++].c_str()); + LOGE("stoi(%{public}s) failed", uriVec[index++].c_str()); return false; } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); -- Gitee