diff --git a/services/applypatch/data_writer.cpp b/services/applypatch/data_writer.cpp index 5ed853d8fe2d886276931ef2abc0163111eb30a9..e47f3127c903a344c9088437268da2615a2243f5 100644 --- a/services/applypatch/data_writer.cpp +++ b/services/applypatch/data_writer.cpp @@ -50,8 +50,7 @@ std::unique_ptr DataWriter::CreateDataWriter(WriteMode mode, const s uint64_t offset) { switch (mode) { - case WRITE_RAW: - { + case WRITE_RAW: { std::unique_ptr writer(std::make_unique(path, offset)); return std::move(writer); } diff --git a/services/package/pkg_manager/pkg_managerImpl.cpp b/services/package/pkg_manager/pkg_managerImpl.cpp index a1df7bb9bcb1d5bd888b9e2cad0537b763cff65b..0ea2609687f7dd33456af033800685ba3b742cc7 100644 --- a/services/package/pkg_manager/pkg_managerImpl.cpp +++ b/services/package/pkg_manager/pkg_managerImpl.cpp @@ -801,7 +801,10 @@ int32_t PkgManagerImpl::VerifyBinFile(const std::string &packagePath, const std: int8_t digestMethod = static_cast(DigestAlgorithm::GetDigestMethod(version)); size_t digestLen = DigestAlgorithm::GetDigestLen(digestMethod); size_t signatureLen = DigestAlgorithm::GetSignatureLen(digestMethod); - PKG_CHECK(digestLen == digest.length, return PKG_INVALID_PARAM, "Invalid digestLen"); + if (digestLen != digest.length) { + PKG_LOGE("Invalid digestLen"); + return PKG_INVALID_PARAM; + } std::vector> digestInfos(DIGEST_INFO_SIGNATURE + 1); digestInfos[DIGEST_INFO_HAS_SIGN].resize(digestLen); digestInfos[DIGEST_INFO_NO_SIGN].resize(digestLen);