openharmony/drivers_adapter
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_adapter.git synced 2026-07-01 22:44:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

!587 fix: remove member access of IRmoteObject

Browse Source 
Merge pull request !587 from yuanbo/master
This commit is contained in:
openharmony_ci
2022-05-28 03:42:41 +00:00
committed by Gitee
parent 3e1585ce9e 7f8357af07
commit d888560ead
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uhdf2/ipc/include/hdf_remote_adapter.h
+1
View File
@@ -56,6 +56,7 @@ struct HdfRemoteServiceHolder {
struct HdfRemoteService service_;
OHOS::sptr<OHOS::IRemoteObject> remote_;
OHOS::sptr<OHOS::IRemoteObject::DeathRecipient> deathRecipient_;
std::u16string descriptor_;
};
struct HdfRemoteService *HdfRemoteAdapterBind(OHOS::sptr<OHOS::IRemoteObject> binder);
uhdf2/ipc/src/hdf_remote_adapter.cpp
+6 -9
View File
@@ -133,7 +133,7 @@ HdfRemoteServiceHolder::HdfRemoteServiceHolder() : remote_(nullptr), deathRecipi
bool HdfRemoteServiceHolder::SetInterfaceDescriptor(const char *desc)
{
if (remote_ == nullptr || desc == nullptr) {
if (desc == nullptr) {
return false;
}
std::u16string newDesc = OHOS::Str8ToStr16(std::string(desc));
@@ -141,10 +141,8 @@ bool HdfRemoteServiceHolder::SetInterfaceDescriptor(const char *desc)
HDF_LOGE("failed to set interface des, error on cover str8 to str16, %{public}s", desc);
return false;
}
static std::mutex descMutex;
std::lock_guard<std::mutex> lock(descMutex);
(const_cast<std::u16string *>(&remote_->descriptor_))->assign(newDesc);
descriptor_.assign(newDesc);
return true;
}
@@ -335,11 +333,11 @@ bool HdfRemoteAdapterWriteInterfaceToken(struct HdfRemoteService *service, struc
HDF_LOGE("failed to write interface token, holder->remote is nullptr");
return false;
}
if (holder->remote_->GetObjectDescriptor().empty()) {
if (holder->descriptor_.empty()) {
HDF_LOGE("failed to write interface token, empty token");
return false;
}
return parcel->WriteInterfaceToken(holder->remote_->GetObjectDescriptor());
return parcel->WriteInterfaceToken(holder->descriptor_);
}
bool HdfRemoteAdapterCheckInterfaceToken(struct HdfRemoteService *service, struct HdfSBuf *data)
@@ -361,9 +359,8 @@ bool HdfRemoteAdapterCheckInterfaceToken(struct HdfRemoteService *service, struc
HDF_LOGE("failed to check interface, empty token");
return false;
}
if (holder->remote_->GetObjectDescriptor() != desc) {
std::string descStr8 = OHOS::Str16ToStr8(desc);
HDF_LOGE("calling unknown interface: %{public}s", descStr8.c_str());
if (holder->descriptor_ != desc) {
HDF_LOGE("calling unknown interface: %{public}s", OHOS::Str16ToStr8(desc).c_str());
return false;
}