From b03d3f6099a128194205e96b4b14a729db65df06 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 6 Sep 2022 18:50:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_info/napi_file_info_exporter.cpp | 5 +++ .../napi_fileaccess_helper.cpp | 35 +++++++++++++++++++ .../root_info/napi_root_info_exporter.cpp | 5 +++ .../root_info/napi_root_iterator_exporter.cpp | 4 +++ 4 files changed, 49 insertions(+) diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index 952307c3..35895ac5 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -65,6 +65,11 @@ napi_value NapiFileInfoExporter::Constructor(napi_env env, napi_callback_info in } auto fileInfoEntity = std::make_unique(); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of fileInfoEntity"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(fileInfoEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileInfoEntity"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index cbba5049..63ee9267 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -176,6 +176,11 @@ napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) } auto result = std::make_shared>(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env);; + return nullptr; + } + auto cbExec = [result]() -> NError { int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(*result); return NError(ret); @@ -304,6 +309,11 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); auto cbExec = [uriString, flags, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); @@ -353,6 +363,11 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { @@ -405,6 +420,11 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { @@ -457,6 +477,11 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); @@ -506,6 +531,11 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string sourceFileString(sourceFile.get()); string targetParentString(targetParent.get()); auto cbExec = [sourceFileString, targetParentString, result, fileAccessHelper]() -> NError { @@ -559,6 +589,11 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result = nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp index 23f009b6..6cb3b456 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -67,6 +67,11 @@ napi_value NapiRootInfoExporter::Constructor(napi_env env, napi_callback_info in } auto rootInfoEntity = std::make_unique(); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootInfoEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj RootInfoEntity"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index 91c6d832..3418f03e 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -57,6 +57,10 @@ napi_value NapiRootIteratorExporter::Constructor(napi_env env, napi_callback_inf } auto rootIteratorEntity = std::make_unique(); + if (rootIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of rootIteratorEntity"); + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootIteratorEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileIteratorEntity"); return nullptr; -- Gitee From f218cf37648c3396ff57725acf17692ed4f7d76b Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 6 Sep 2022 19:15:12 +0800 Subject: [PATCH 2/2] ennd --- .../file_access_module/napi_fileaccess_helper.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 63ee9267..5055d924 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -176,7 +176,7 @@ napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) } auto result = std::make_shared>(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env);; return nullptr; } @@ -309,7 +309,7 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } @@ -363,7 +363,7 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } @@ -420,7 +420,7 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } @@ -477,7 +477,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } @@ -531,7 +531,7 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } @@ -589,7 +589,7 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) } auto result = std::make_shared(); - if (result = nullptr) { + if (result == nullptr) { NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } -- Gitee