openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix wildcard pointer.

Browse Source 
Sig:SIG_ApplicationFramework
Feature or BugFix: Feature
Binary Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: I3b05ba51fc65e71ec4c69244b02d8220a7d05fc9
This commit is contained in:
zhangyafei.echo
2024-04-10 15:44:00 +08:00
parent 1bda456547
commit 391373decd
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/runtime/js_worker.cpp
+12 -21
View File
@@ -164,8 +164,8 @@ AssetHelper::~AssetHelper()
}
}
void AssetHelper::operator()(const std::string& uri, uint8_t** buff, size_t* buffSize, std::string& ami,
bool& useSecureMem, bool isRestricted)
void AssetHelper::operator()(const std::string& uri, uint8_t** buff, size_t* buffSize, std::vector<uint8_t>& content,
std::string& ami, bool& useSecureMem, bool isRestricted)
{
if (uri.empty() || buff == nullptr || buffSize == nullptr || workerInfo_ == nullptr) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Input params invalid.");
@@ -211,10 +211,10 @@ void AssetHelper::operator()(const std::string& uri, uint8_t** buff, size_t* buf
TAG_LOGD(AAFwkTag::JSRUNTIME, "Get asset, ami: %{private}s", ami.c_str());
if (ami.find(CACHE_DIRECTORY) != std::string::npos) {
if (!ReadAmiData(ami, buff, buffSize, useSecureMem, isRestricted)) {
if (!ReadAmiData(ami, buff, buffSize, content, useSecureMem, isRestricted)) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Get buffer by ami failed.");
}
} else if (!ReadFilePathData(filePath, buff, buffSize, useSecureMem, isRestricted)) {
} else if (!ReadFilePathData(filePath, buff, buffSize, content, useSecureMem, isRestricted)) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Get buffer by filepath failed.");
}
} else {
@@ -249,10 +249,10 @@ void AssetHelper::operator()(const std::string& uri, uint8_t** buff, size_t* buf
ami = workerInfo_->codePath + filePath;
TAG_LOGD(AAFwkTag::JSRUNTIME, "Get asset, ami: %{private}s", ami.c_str());
if (ami.find(CACHE_DIRECTORY) != std::string::npos) {
if (!ReadAmiData(ami, buff, buffSize, useSecureMem, isRestricted)) {
if (!ReadAmiData(ami, buff, buffSize, content, useSecureMem, isRestricted)) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Get buffer by ami failed.");
}
} else if (!ReadFilePathData(filePath, buff, buffSize, useSecureMem, isRestricted)) {
} else if (!ReadFilePathData(filePath, buff, buffSize, content, useSecureMem, isRestricted)) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Get buffer by filepath failed.");
}
}
@@ -303,7 +303,7 @@ bool AssetHelper::GetSafeData(const std::string& ami, uint8_t** buff, size_t* bu
return true;
}
bool AssetHelper::ReadAmiData(const std::string& ami, uint8_t** buff, size_t* buffSize,
bool AssetHelper::ReadAmiData(const std::string& ami, uint8_t** buff, size_t* buffSize, std::vector<uint8_t>& content,
bool& useSecureMem, bool isRestricted)
{
// Current function is a private, validity of workerInfo_ has been checked by caller.
@@ -344,22 +344,14 @@ bool AssetHelper::ReadAmiData(const std::string& ami, uint8_t** buff, size_t* bu
return false;
}
auto temp = std::make_unique<uint8_t[]>(fileLen);
if (temp == nullptr) {
TAG_LOGE(AAFwkTag::JSRUNTIME, "Alloc mem failed.");
return false;
}
stream.seekg(0, std::ios::beg);
stream.read(reinterpret_cast<char*>(temp.get()), fileLen);
*buff = temp.get();
*buffSize = fileLen;
content.resize(fileLen);
stream.seekg(0);
stream.read(reinterpret_cast<char*>(content.data()), content.size());
return true;
}
bool AssetHelper::ReadFilePathData(const std::string& filePath, uint8_t** buff, size_t* buffSize,
bool& useSecureMem, bool isRestricted)
std::vector<uint8_t>& content, bool& useSecureMem, bool isRestricted)
{
auto bundleMgrHelper = DelayedSingleton<AppExecFwk::BundleMgrHelper>::GetInstance();
if (bundleMgrHelper == nullptr) {
@@ -453,8 +445,7 @@ bool AssetHelper::ReadFilePathData(const std::string& filePath, uint8_t** buff,
return false;
}
*buff = dataPtr.get();
*buffSize = fileLen;
content.assign(dataPtr.get(), dataPtr.get() + fileLen);
return true;
}
frameworks/native/runtime/js_worker.h
+4 -4
View File
@@ -44,16 +44,16 @@ public:
virtual ~AssetHelper();
void operator()(const std::string& uri, uint8_t** buff, size_t* buffSize, std::string& ami,
bool& useSecureMem, bool isRestricted = false);
void operator()(const std::string& uri, uint8_t** buff, size_t* buffSize, std::vector<uint8_t>& content,
std::string& ami, bool& useSecureMem, bool isRestricted = false);
private:
std::string NormalizedFileName(const std::string& fileName) const;
bool ReadAmiData(const std::string& ami, uint8_t** buff, size_t* buffSize,
bool ReadAmiData(const std::string& ami, uint8_t** buff, size_t* buffSize, std::vector<uint8_t>& content,
bool& useSecureMem, bool isRestricted);
bool ReadFilePathData(const std::string& filePath, uint8_t** buff, size_t* buffSize,
bool ReadFilePathData(const std::string& filePath, uint8_t** buff, size_t* buffSize, std::vector<uint8_t>& content,
bool& useSecureMem, bool isRestricted);
void GetAmi(std::string& ami, const std::string& filePath);
frameworks/native/runtime/ohos_js_environment_impl.cpp
+2
View File
@@ -160,9 +160,11 @@ void OHOSJsEnvironmentImpl::InitWorkerModule(NativeEngine* engine, std::shared_p
{
TAG_LOGD(AAFwkTag::JSRUNTIME, "called");
CHECK_POINTER(engine);
CHECK_POINTER(workerInfo);
engine->SetInitWorkerFunc(InitWorkerFunc);
engine->SetOffWorkerFunc(OffWorkerFunc);
engine->SetGetAssetFunc(AssetHelper(workerInfo));
engine->SetApiVersion(workerInfo->apiTargetVersion);
engine->SetGetContainerScopeIdFunc(GetContainerId);
engine->SetInitContainerScopeFunc(UpdateContainerScope);
test/unittest/runtime_test/js_worker_test.cpp
+2 -1
View File
@@ -84,11 +84,12 @@ HWTEST_F(JsWorkerTest, AssetHelper_0100, TestSize.Level1)
std::string uri = "/data";
uint8_t *buff = nullptr;
size_t buffSize;
std::vector<uint8_t> content;
std::string ami;
bool useSecureMem;
bool isRestricted = false;
auto func = TestGetGetAssetFunc();
func("/data", &buff, &buffSize, ami, useSecureMem, isRestricted);
func("/data", &buff, &buffSize, content, ami, useSecureMem, isRestricted);
EXPECT_EQ(useSecureMem, false);
}