diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 34f6487860db5378b2c74bf943d03e111b9e1cab..2068a5585b19c581039241a6e5110ae529ed7035 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -156,9 +156,6 @@ if (defined(ohos_lite)) { boundary_sanitize = true integer_overflow = true ubsan = true - cfi = true - cfi_cross_dso = true - debug = false } cflags = [ diff --git a/radar/BUILD.gn b/radar/BUILD.gn index 49dc533a0e4fd4101da4b43289fa00b47debdf90..1a5793e7ad2d44f7e2055b5a8a08524d55c90247 100644 --- a/radar/BUILD.gn +++ b/radar/BUILD.gn @@ -68,7 +68,7 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp/include", "${json_path}/include", ] - branch_protector_ret = "pac_ret" + sanitize = { cfi = true cfi_cross_dso = true @@ -125,7 +125,7 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp/include", "${json_path}/include", ] - branch_protector_ret = "pac_ret" + sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp index f76e292013f171beec6014f58ee786f02576f792..a054c1bc317f8fc9babec1dd7c2a87f69b58aa4f 100644 --- a/services/implementation/src/device_manager_service_impl.cpp +++ b/services/implementation/src/device_manager_service_impl.cpp @@ -278,10 +278,6 @@ void DeviceManagerServiceImpl::ImportAuthCodeToConfig(std::shared_ptr authMgr = nullptr; @@ -310,10 +306,6 @@ int32_t DeviceManagerServiceImpl::InitNewProtocolAuthMgr(bool isSrcSide, uint64_ int32_t DeviceManagerServiceImpl::InitOldProtocolAuthMgr(uint64_t tokenId, const std::string &pkgName) { - if (pkgName.empty()) { - LOGE("pkgName is empty"); - return ERR_DM_INPUT_PARA_INVALID; - } LOGI("tokenId: %{public}" PRIu64 ", pkgname:%{public}s", tokenId, pkgName.c_str()); if (authMgr_ == nullptr) { CreateGlobalClassicalAuthMgr(); diff --git a/services/softbuscache/BUILD.gn b/services/softbuscache/BUILD.gn index 304974efe0e0536286bf2afe4238e038d78ddb72..49a243c36afd9896067c0f8e8a4bcd6b9336462e 100644 --- a/services/softbuscache/BUILD.gn +++ b/services/softbuscache/BUILD.gn @@ -50,7 +50,6 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("dmdevicecache") { - branch_protector_ret = "pac_ret" sanitize = { boundary_sanitize = true cfi = true