openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 10:09:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!9528 Modify napi_load_module_with_info error type

Browse Source 
Merge pull request !9528 from chenlincl3/napi_crash
This commit is contained in:
openharmony_ci 2024-10-25 02:46:33 +00:00 committed by Gitee
commit 254b20097e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ecmascript/module/napi_module_loader.cpp
View File

@ -23,17 +23,20 @@ namespace panda::ecmascript {
JSHandle<JSTaggedValue> NapiModuleLoader::LoadModuleNameSpaceWithModuleInfo(EcmaVM *vm, CString &requestPath,
CString &modulePath)
{
LOG_ECMA(DEBUG) << "NapiModuleLoader::LoadModuleNameSpaceWithModuleInfo requestPath:" << requestPath <<
"," << "modulePath:" << modulePath;
CString moduleStr = ModulePathHelper::GetModuleNameWithPath(modulePath);
CString abcFilePath = ModulePathHelper::ConcatPandaFilePath(moduleStr);
JSThread *thread = vm->GetJSThread();
std::shared_ptr<JSPandaFile> curJsPandaFile;
if (modulePath.size() != 0) {
curJsPandaFile = JSPandaFileManager::GetInstance()->LoadJSPandaFile(thread, abcFilePath, requestPath);
if (curJsPandaFile == nullptr) {
bool isValid = JSPandaFileManager::GetInstance()->CheckFilePath(thread, abcFilePath);
if (!isValid) {
CString msg = "Load file with filename '" + abcFilePath +
"' failed, module name '" + requestPath + "'" + ", from napi load module";
THROW_NEW_ERROR_AND_RETURN_HANDLE(thread, ErrorType::REFERENCE_ERROR, JSTaggedValue, msg.c_str());
}
curJsPandaFile = JSPandaFileManager::GetInstance()->LoadJSPandaFile(thread, abcFilePath, requestPath);
if (vm->IsNormalizedOhmUrlPack()) {
ModulePathHelper::TranslateExpressionToNormalized(thread, curJsPandaFile.get(), abcFilePath, "",
requestPath);
@ -59,13 +62,14 @@ JSHandle<JSTaggedValue> NapiModuleLoader::LoadModuleNameSpaceWithPath(JSThread *
abcFilePath, modulePath, requestPath);
RETURN_HANDLE_IF_ABRUPT_COMPLETION(JSTaggedValue, thread);
std::shared_ptr<JSPandaFile> jsPandaFile =
JSPandaFileManager::GetInstance()->LoadJSPandaFile(thread, abcFilePath, entryPoint);
if (jsPandaFile == nullptr) {
bool isValid = JSPandaFileManager::GetInstance()->CheckFilePath(thread, abcFilePath);
if (!isValid) {
CString msg = "Load file with filename '" + abcFilePath +
"' failed, module name '" + requestPath + "'" + ", from napi load module";
THROW_NEW_ERROR_AND_RETURN_HANDLE(thread, ErrorType::REFERENCE_ERROR, JSTaggedValue, msg.c_str());
}
std::shared_ptr<JSPandaFile> jsPandaFile =
JSPandaFileManager::GetInstance()->LoadJSPandaFile(thread, abcFilePath, entryPoint);
JSRecordInfo *recordInfo = nullptr;
bool hasRecord = jsPandaFile->CheckAndGetRecordInfo(entryPoint, &recordInfo);