openharmony/useriam_user_auth
1
0
Fork 0
mirror of https://github.com/openharmony/useriam_user_auth.git synced 2026-07-19 22:33:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bug for xts crash

Browse Source 
Signed-off-by: https://gitee.com/WALL_EYE <wangguoqiang12@huawei.com>
Change-Id: Iaea45622298ef675defd3d3a4b77764afc6db05f
This commit is contained in:
https://gitee.com/WALL_EYE
2022-03-07 15:30:15 +08:00
parent f89b52967b
commit 9e24aba0cd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/context_thread_pool.cpp
Executable → Regular
-2
View File
@@ -33,7 +33,6 @@ ContextThreadPool &ContextThreadPool::GetInstance()
bool ContextThreadPool::AddTask(const uint64_t context, const ThreadPool::Task& f)
{
USERAUTH_HILOGD(MODULE_SERVICE, "userauth AddTask is start!");
std::lock_guard<std::mutex> taskMutexGuard(taskMutex_);
if (ThreadPool::GetCurTaskNum() >= ThreadPool::GetMaxTaskNum()) {
return false;
@@ -65,7 +64,6 @@ void ContextThreadPool::TaskFunction(const uint64_t context, const ThreadPool::T
ThreadPool::Task ContextThreadPool::CheckTask(const uint64_t context)
{
USERAUTH_HILOGD(MODULE_SERVICE, "userauth CheckTask is start!");
std::lock_guard<std::mutex> taskMutexGuard(taskMutex_);
if (ctMap_.count(context) != 0) {
ContextTask contextTask = ctMap_[context];
services/src/userauth_excallback_impl.cpp
+7 -4
View File
@@ -175,6 +175,7 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector
SetPropertyRequest setPropertyRequest;
GetPropertyRequest getPropertyRequest;
AuthResult authResult;
int32_t ret = GENERAL_ERROR;
std::lock_guard<std::mutex> lock(mutex_);
USERAUTH_HILOGD(MODULE_SERVICE, "OnFinishHandle scheduleTokensize:%{public}d, resultCode:%{public}u",
scheduleToken.size(), resultCode);
@@ -182,8 +183,10 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector
if (isResultDoneFlag_) {
return;
}
int32_t ret = UserAuthAdapter::GetInstance().RequestAuthResult(callbackContextID_,
if (resultCode != CANCELED) {
ret = UserAuthAdapter::GetInstance().RequestAuthResult(callbackContextID_,
scheduleToken, authToken, sessionIds);
}
if (ret == E_RET_UNDONE) {
if (callbackNowCount_ == callbackCount_) {
USERAUTH_HILOGD(MODULE_SERVICE, "UserAuthCallbackImplCoAuth E_RET_UNDONE");
@@ -202,14 +205,14 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector
getPropertyRequest.authType = authType_;
getPropertyRequest.keys.push_back(UserAuth::REMAIN_TIMES);
getPropertyRequest.keys.push_back(UserAuth::FREEZING_TIME);
UserAuthAdapter::GetInstance().GetPropAuthInfoCoauth(userID_, callerUid_, pkgName_, ret,
UserAuthAdapter::GetInstance().GetPropAuthInfoCoauth(userID_, callerUid_, pkgName_, resultCode,
authToken, getPropertyRequest, callback_);
}
} else {
USERAUTH_HILOGD(MODULE_SERVICE, "UserAuthCallbackImplCoAuth resultCode == LOCKED");
setPropertyRequest.authType = authType_;
setPropertyRequest.key = SetPropertyType::FREEZE_TEMPLATE;
UserAuthAdapter::GetInstance().CoauthSetPropAuthInfo(userID_, ret, callerUid_, pkgName_, authToken,
UserAuthAdapter::GetInstance().CoauthSetPropAuthInfo(userID_, resultCode, callerUid_, pkgName_, authToken,
setPropertyRequest, callback_);
}
if (sessionIds.size() != 0) {
@@ -287,7 +290,7 @@ void UserAuthCallbackImplIDMGetPorp::OnGetInfo(std::vector<UserIDM::CredentialIn
USERAUTH_HILOGD(MODULE_SERVICE, "UserAuthCallbackImplIDMGetPorp OnGetInfo enter");
ExecutorProperty executorProperty = {};
if (info.size() == 0) {
executorProperty.result = GENERAL_ERROR;
executorProperty.result = FAIL;
callback_->onExecutorPropertyInfo(executorProperty);
return;
}