From 5adfa8d0db9dd69b321840731ab97ed8b6cf0739 Mon Sep 17 00:00:00 2001
From: zhangzezhong <zhangzezhong8@huawei-partners.com>
Date: Fri, 13 Jun 2025 21:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sts=5Fcontext.cpp=E6=A3=80?=
 =?UTF-8?q?=E8=A7=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangzezhong <zhangzezhong8@huawei-partners.com>
---
 .../context/sts_context_utils.cpp             | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp b/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp
index 211769500dc..0caf430887e 100644
--- a/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp
+++ b/frameworks/native/appkit/ability_runtime/context/sts_context_utils.cpp
@@ -12,21 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include "sts_context_utils.h"
-
+#include "ability_runtime_error_util.h"
 #include "ani_common_util.h"
 #include "ani_enum_convert.h"
 #include "application_context.h"
 #include "application_context_manager.h"
 #include "common_fun_ani.h"
 #include "hilog_tag_wrapper.h"
+#include "ipc_skeleton.h"
 #include "resourceManager.h"
+#include "sts_context_utils.h"
 #include "sts_error_utils.h"
-#include "ani_common_util.h"
-#include "ability_runtime_error_util.h"
 #include "tokenid_kit.h"
-#include "ipc_skeleton.h"
 
 namespace OHOS {
 namespace AbilityRuntime {
@@ -38,7 +35,10 @@ static std::weak_ptr<Context> context_;
 void BindApplicationCtx(ani_env* aniEnv, ani_class contextClass, ani_object contextObj,
     void* applicationCtxRef)
 {
-    // bind parent context field:applicationContext
+    if (aniEnv == nullptr) {
+        TAG_LOGE(AAFwkTag::APPKIT, "aniEnv or context is nullptr");
+        return;
+    }
     ani_field applicationContextField;
     if (aniEnv->Class_FindField(contextClass, "applicationContext", &applicationContextField) != ANI_OK) {
         TAG_LOGE(AAFwkTag::APPKIT, "Class_FindField failed");
@@ -54,6 +54,10 @@ void BindApplicationCtx(ani_env* aniEnv, ani_class contextClass, ani_object cont
 void BindApplicationInfo(ani_env* aniEnv, ani_class contextClass, ani_object contextObj,
     std::shared_ptr<Context> context)
 {
+    if (aniEnv == nullptr || context == nullptr) {
+        TAG_LOGE(AAFwkTag::APPKIT, "aniEnv or context is nullptr");
+        return;
+    }
     ani_field applicationInfoField;
     if (ANI_OK != aniEnv->Class_FindField(contextClass, "applicationInfo", &applicationInfoField)) {
         TAG_LOGE(AAFwkTag::APPKIT, "find applicationInfo failed");
@@ -71,6 +75,10 @@ void BindApplicationInfo(ani_env* aniEnv, ani_class contextClass, ani_object con
 void BindResourceManager(ani_env* aniEnv, ani_class contextClass, ani_object contextObj,
     std::shared_ptr<Context> context)
 {
+    if (aniEnv == nullptr || context == nullptr) {
+        TAG_LOGE(AAFwkTag::APPKIT, "aniEnv or context is nullptr");
+        return;
+    }
     ani_field resourceManagerField;
     if (ANI_OK != aniEnv->Class_FindField(contextClass, "resourceManager", &resourceManagerField)) {
         TAG_LOGE(AAFwkTag::APPKIT, "find resourceManager failed");
@@ -88,6 +96,10 @@ void BindResourceManager(ani_env* aniEnv, ani_class contextClass, ani_object con
 void BindParentProperty(ani_env* aniEnv, ani_class contextClass, ani_object contextObj,
     std::shared_ptr<Context> context)
 {
+    if (aniEnv == nullptr || context == nullptr) {
+        TAG_LOGE(AAFwkTag::APPKIT, "aniEnv or context is nullptr");
+        return;
+    }
     BindApplicationInfo(aniEnv, contextClass, contextObj, context);
     BindResourceManager(aniEnv, contextClass, contextObj, context);
 
@@ -139,6 +151,10 @@ void BindParentProperty(ani_env* aniEnv, ani_class contextClass, ani_object cont
 void BindParentPropertyInner(ani_env *aniEnv, ani_class contextClass, ani_object contextObj,
     std::shared_ptr<Context> context)
 {
+    if (aniEnv == nullptr || context == nullptr) {
+        TAG_LOGE(AAFwkTag::APPKIT, "aniEnv or context is nullptr");
+        return;
+    }
     ani_status status = ANI_ERROR;
     ani_field processNameField;
     if ((status = aniEnv->Class_FindField(contextClass, "processName", &processNameField)) != ANI_OK) {
@@ -269,10 +285,10 @@ ani_object CreateModuleResourceManagerSync([[maybe_unused]]ani_env *env, [[maybe
         TAG_LOGE(AAFwkTag::APPKIT, "env is nullptr");
         return {};
     }
-    std::string bundleName_ = "";
-    AppExecFwk::AniStringToStdString(env, bundleName, bundleName_);
-    std::string moduleName_ = "";
-    AppExecFwk::AniStringToStdString(env, moduleName, moduleName_);
+    std::string stdBundleName = "";
+    AppExecFwk::AniStringToStdString(env, bundleName, stdBundleName);
+    std::string stdModuleName = "";
+    AppExecFwk::AniStringToStdString(env, moduleName, stdModuleName);
     auto context = context_.lock();
     if (!context) {
         TAG_LOGE(AAFwkTag::APPKIT, "null context");
@@ -284,7 +300,7 @@ ani_object CreateModuleResourceManagerSync([[maybe_unused]]ani_env *env, [[maybe
         ThrowStsError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP);
         return {};
     }
-    auto resourceManager = context->CreateModuleResourceManager(bundleName_, moduleName_);
+    auto resourceManager = context->CreateModuleResourceManager(stdBundleName, stdModuleName);
     if (resourceManager == nullptr) {
         TAG_LOGE(AAFwkTag::APPKIT, "null resourceManager");
         ThrowStsError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM);
-- 
Gitee