From 6678aea17c786b4735c582fd52139507c4bece18 Mon Sep 17 00:00:00 2001 From: yanhuan Date: Mon, 14 Apr 2025 10:24:24 +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 | 7 ++++++- packing_tool/frameworks/src/version_normalize.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index a116c0ef..1ab881f6 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -122,7 +122,12 @@ 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 failed."); + } 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..cc673f09 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -266,7 +266,12 @@ 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 failed."); + } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee From f6752353470278c21d6ca4f71b8399ab6eab270b Mon Sep 17 00:00:00 2001 From: yanhuan Date: Mon, 14 Apr 2025 19:32:14 +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 --- .../frameworks/src/package_normalize.cpp | 17 +++++++++++++---- .../frameworks/src/version_normalize.cpp | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index 1ab881f6..4f9bf8fd 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -123,10 +123,19 @@ int32_t PackageNormalize::Process() std::string tempPath = outPath + Constants::LINUX_FILE_SEPARATOR + Constants::COMPRESSOR_PACKAGENORMALIZE_TEMP_DIR + Utils::GenerateUUID(); int32_t versionCode = 0; - try { - versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); - } catch (...) { - LOGE("stoi failed."); + auto it = parameterMap_.find(Constants::PARAM_VERSION_CODE); + if (it != parameterMap_end()) { + try { + versionCode = std::stoi(it->second); + } catch (const std::invalid_argument& e) { + LOGE("invalid argument: %s", e.what()); + } catch (const std::out_of_range& e) { + LOGE("Out of range: %s", e.what()); + } catch (const std::exception& e) { + LOGE("Exception: %s", e.what()); + } + } else { + LOGE("Parameter not found: %s", 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 cc673f09..7d61d67a 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -267,10 +267,19 @@ int32_t VersionNormalize::Process() std::string tempPath = outPath + Constants::LINUX_FILE_SEPARATOR + Constants::COMPRESSOR_VERSIONNORMALIZE_TEMP_DIR + Utils::GenerateUUID(); int32_t versionCode = 0; - try { - versionCode = std::stoi(parameterMap_.at(Constants::PARAM_VERSION_CODE)); - } catch (...) { - LOGE("stoi failed."); + auto it = parameterMap_.find(Constants::PARAM_VERSION_CODE); + if (it != parameterMap_end()) { + try { + versionCode = std::stoi(it->second); + } catch (const std::invalid_argument& e) { + LOGE("invalid argument: %s", e.what()); + } catch (const std::out_of_range& e) { + LOGE("Out of range: %s", e.what()); + } catch (const std::exception& e) { + LOGE("Exception: %s", e.what()); + } + } else { + LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE); } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee From 09bcd6423c9b5465bdf78ac2f820db2fb45a7c62 Mon Sep 17 00:00:00 2001 From: yanhuan Date: Mon, 14 Apr 2025 20:09:46 +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 | 6 ++---- packing_tool/frameworks/src/version_normalize.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index 4f9bf8fd..0ab317e4 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -124,18 +124,16 @@ int32_t PackageNormalize::Process() + Utils::GenerateUUID(); int32_t versionCode = 0; auto it = parameterMap_.find(Constants::PARAM_VERSION_CODE); - if (it != parameterMap_end()) { + if (it != parameterMap_.end()) { try { versionCode = std::stoi(it->second); - } catch (const std::invalid_argument& e) { - LOGE("invalid argument: %s", e.what()); } catch (const std::out_of_range& e) { LOGE("Out of range: %s", e.what()); } catch (const std::exception& e) { LOGE("Exception: %s", e.what()); } } else { - LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE); + LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE.c_str()); } 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 7d61d67a..3bb07a9d 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -268,18 +268,16 @@ int32_t VersionNormalize::Process() + Utils::GenerateUUID(); int32_t versionCode = 0; auto it = parameterMap_.find(Constants::PARAM_VERSION_CODE); - if (it != parameterMap_end()) { + if (it != parameterMap_.end()) { try { versionCode = std::stoi(it->second); - } catch (const std::invalid_argument& e) { - LOGE("invalid argument: %s", e.what()); } catch (const std::out_of_range& e) { LOGE("Out of range: %s", e.what()); } catch (const std::exception& e) { LOGE("Exception: %s", e.what()); } } else { - LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE); + LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE.c_str()); } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee From 8c907f99e575f0ca270e42ae7909728d73163924 Mon Sep 17 00:00:00 2001 From: yanhuan Date: Wed, 16 Apr 2025 11:20:04 +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 | 4 ++-- packing_tool/frameworks/src/version_normalize.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packing_tool/frameworks/src/package_normalize.cpp b/packing_tool/frameworks/src/package_normalize.cpp index 0ab317e4..2b2a528a 100644 --- a/packing_tool/frameworks/src/package_normalize.cpp +++ b/packing_tool/frameworks/src/package_normalize.cpp @@ -127,13 +127,13 @@ int32_t PackageNormalize::Process() if (it != parameterMap_.end()) { try { versionCode = std::stoi(it->second); - } catch (const std::out_of_range& e) { - LOGE("Out of range: %s", e.what()); } catch (const std::exception& e) { LOGE("Exception: %s", e.what()); + return ERR_INVALID_VALUE; } } else { LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE.c_str()); + return ERR_INVALID_VALUE; } 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 3bb07a9d..850923d4 100644 --- a/packing_tool/frameworks/src/version_normalize.cpp +++ b/packing_tool/frameworks/src/version_normalize.cpp @@ -271,13 +271,13 @@ int32_t VersionNormalize::Process() if (it != parameterMap_.end()) { try { versionCode = std::stoi(it->second); - } catch (const std::out_of_range& e) { - LOGE("Out of range: %s", e.what()); } catch (const std::exception& e) { LOGE("Exception: %s", e.what()); + return ERR_INVALID_VALUE; } } else { LOGE("Parameter not found: %s", Constants::PARAM_VERSION_CODE.c_str()); + return ERR_INVALID_VALUE; } std::string versionName = parameterMap_.at(Constants::PARAM_VERSION_NAME); std::list normalizeVersionList; -- Gitee