openharmony/useriam_user_auth_framework
1
0
Fork 0
mirror of https://gitee.com/openharmony/useriam_user_auth_framework synced 2024-11-27 01:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix fuzz problem

Browse Source 
Signed-off-by: youliang_1314 <youliang4@huawei.com>
Change-Id: I8efcaf7e69d51ced15b7015f38689412928690f7
This commit is contained in:
youliang_1314 2022-08-03 17:13:45 +08:00
parent c4fabc801a
commit c55d52f562
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/executors/src/framework/framework_executor_callback.cpp
View File

@ -251,7 +251,8 @@ ResultCode FrameworkExecutorCallback::ProcessGetTemplateCommand(
TemplateInfo templateInfo = {};
ResultCode ret = hdi->GetTemplateInfo(templateId, templateInfo);
IF_FALSE_LOGE_AND_RETURN_VAL(ret == SUCCESS, ret);
int32_t subType = *(static_cast<int32_t *>(static_cast<void *>(templateInfo.extraInfo.data())));
int32_t subType = 0;
Common::UnpackInt32(templateInfo.extraInfo, 0, subType);
bool setAuthSubTypeRet = values->SetInt32Value(Attributes::ATTR_PIN_SUB_TYPE, subType);
IF_FALSE_LOGE_AND_RETURN_VAL(setAuthSubTypeRet == true, ResultCode::GENERAL_ERROR);
bool setAuthRemainTimeRet =

11
common/utils/iam_mem.cpp
View File

@ -36,6 +36,17 @@ int32_t UnpackUint64(const std::vector<uint8_t> &src, size_t index, uint64_t &da
}
return 0;
}
int32_t UnpackInt32(const std::vector<uint8_t> &src, size_t index, int32_t &data)
{
if ((src.size() < index) || (src.size() - index < sizeof(int32_t))) {
return 1;
}
if (memcpy_s(static_cast<void *>(&data), sizeof(int32_t), &src[index], sizeof(int32_t)) != 0) {
return 1;
}
return 0;
}
} // namespace Common
} // namespace UserIam
} // namespace OHOS

1
common/utils/iam_mem.h
View File

@ -30,6 +30,7 @@ inline void Pack(std::vector<uint8_t> &dst, const T &data)
}
int32_t UnpackUint64(const std::vector<uint8_t> &src, size_t index, uint64_t &data);
int32_t UnpackInt32(const std::vector<uint8_t> &src, size_t index, int32_t &data);
inline uint32_t CombineUint16ToUint32(uint16_t upper, uint16_t lower)
{

4
test/unittest/executors/executor_unit_test.cpp
View File

@ -850,7 +850,7 @@ HWTEST_F(ExecutorUnitTest, UserAuthExecutor_OnGetPropertyTest_001, TestSize.Leve
static const uint64_t testTemplateId = 123;
static const int32_t testFreezingTime = 456;
static const int32_t testRemainTimes = 789;
static const uint64_t testAuthSubType = 101112;
static const int32_t testAuthSubType = 101112;
shared_ptr<Executor> executor;
shared_ptr<ExecutorRegisterCallback> executorCallback;
@ -865,7 +865,7 @@ HWTEST_F(ExecutorUnitTest, UserAuthExecutor_OnGetPropertyTest_001, TestSize.Leve
EXPECT_EQ(templateId, testTemplateId);
info.freezingTime = testFreezingTime;
info.remainTimes = testRemainTimes;
Common::Pack<uint64_t>(info.extraInfo, testAuthSubType);
Common::Pack<int32_t>(info.extraInfo, testAuthSubType);
return ResultCode::SUCCESS;
});