From 39a9c7130c5240267efc8825f2f0a2320fff8e88 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Fri, 22 Jul 2022 16:59:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=BB=E9=99=A4libace.z.so?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- adapter/appspawn_ace.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter/appspawn_ace.cpp b/adapter/appspawn_ace.cpp index debbbd4b..3123596d 100644 --- a/adapter/appspawn_ace.cpp +++ b/adapter/appspawn_ace.cpp @@ -27,7 +27,6 @@ void LoadExtendLib(AppSpawnContent *content) APPSPAWN_LOGI("MainThread::LoadAbilityLibrary. Start calling dlopen acelibdir."); #ifndef APPSPAWN_TEST void *AceAbilityLib = NULL; - AceAbilityLib = dlopen(acelibdir, RTLD_NOW | RTLD_GLOBAL); APPSPAWN_CHECK(AceAbilityLib != NULL, return, "Fail to dlopen %s, [%s]", acelibdir, dlerror()); #endif APPSPAWN_LOGI("Success to dlopen %s", acelibdir); -- Gitee From 64f6d5ccb4f517d9f5ec89e642dcbb50a48097b8 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Fri, 22 Jul 2022 17:33:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- standard/appspawn_service.c | 2 +- .../app_spawn_standard_test/app_spawn_standard_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/standard/appspawn_service.c b/standard/appspawn_service.c index da463042..61bdbdc4 100644 --- a/standard/appspawn_service.c +++ b/standard/appspawn_service.c @@ -97,7 +97,7 @@ APPSPAWN_STATIC void AddAppInfo(pid_t pid, const char *processName) APPSPAWN_LOGI("Add %s, pid=%d success", processName, pid); } -APPSPAWN_STATIC void ProcessTimer(const TimerHandle taskHandle, void *context) +APPSPAWN_STATIC void ProcessTimer(const TimerHandle taskHandle) { APPSPAWN_LOGI("timeout stop appspawn"); LE_StopLoop(LE_GetDefaultLoop()); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp index a5f55ddb..b5578829 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp @@ -45,7 +45,7 @@ using nlohmann::json; int OnConnection(const LoopHandle loopHandle, const TaskHandle server); void AddAppInfo(pid_t pid, const char *processName); void OnReceiveRequest(const TaskHandle taskHandle, const uint8_t *buffer, uint32_t buffLen); -void ProcessTimer(const TimerHandle taskHandle, void *context); +void ProcessTimer(const TimerHandle taskHandle); void SignalHandler(const struct signalfd_siginfo *siginfo); void SendMessageComplete(const TaskHandle taskHandle, BufferHandle handle); TaskHandle GetTestClientHandle(); @@ -318,7 +318,7 @@ HWTEST(AppSpawnStandardTest, App_Spawn_Standard_07, TestSize.Level0) SignalHandler(&siginfo); content->content.runAppSpawn(&content->content, 0, nullptr); - ProcessTimer(nullptr, nullptr); + ProcessTimer(nullptr); GTEST_LOG_(INFO) << "App_Spawn_Standard_07 end"; } -- Gitee From 6c3c727829cbd80f787e42617e698be2036c1b9a Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Fri, 22 Jul 2022 17:45:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- adapter/appspawn_ace.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/adapter/appspawn_ace.cpp b/adapter/appspawn_ace.cpp index 3123596d..debbbd4b 100644 --- a/adapter/appspawn_ace.cpp +++ b/adapter/appspawn_ace.cpp @@ -27,6 +27,7 @@ void LoadExtendLib(AppSpawnContent *content) APPSPAWN_LOGI("MainThread::LoadAbilityLibrary. Start calling dlopen acelibdir."); #ifndef APPSPAWN_TEST void *AceAbilityLib = NULL; + AceAbilityLib = dlopen(acelibdir, RTLD_NOW | RTLD_GLOBAL); APPSPAWN_CHECK(AceAbilityLib != NULL, return, "Fail to dlopen %s, [%s]", acelibdir, dlerror()); #endif APPSPAWN_LOGI("Success to dlopen %s", acelibdir); -- Gitee From 936fb3110c39587402d65be85cac66d4be4d6a7c Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Fri, 22 Jul 2022 18:42:16 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- common/appspawn_server.c | 4 ++-- standard/appspawn_service.c | 2 +- util/src/sandbox_utils.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/appspawn_server.c b/common/appspawn_server.c index 7d27d8ea..d46161f7 100644 --- a/common/appspawn_server.c +++ b/common/appspawn_server.c @@ -114,9 +114,9 @@ int ForkChildProc(struct AppSpawnContent_ *content, AppSpawnClient *client, pid_ int ret = -1; #ifdef ASAN_DETECTOR if ((content->getWrapBundleNameValue != NULL && content->getWrapBundleNameValue(content, client) == 0) - || (client->flags & APP_COLD_START)) { + || ((client->flags & APP_COLD_START) != 0)) { #else - if (client->flags & APP_COLD_START) { + if ((client->flags & APP_COLD_START) != 0) { #endif if (content->coldStartApp != NULL && content->coldStartApp(content, client) == 0) { #ifndef APPSPAWN_TEST diff --git a/standard/appspawn_service.c b/standard/appspawn_service.c index 61bdbdc4..1042cba2 100644 --- a/standard/appspawn_service.c +++ b/standard/appspawn_service.c @@ -275,7 +275,7 @@ static void CheckColdAppEnabled(AppSpawnClientExt *appProperty) return; } - if (appProperty->property.flags & 0x01) { + if ((appProperty->property.flags & 0x01) != 0) { char cold[10] = {0}; // 10 cold int ret = GetParameter("appspawn.cold.boot", "false", cold, sizeof(cold)); APPSPAWN_LOGV("appspawn.cold.boot %s %d ", cold, ret); diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index 2d46e097..23dda210 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -368,7 +368,7 @@ int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProper bool checkFlag = false; if (appConfig.find(FLAGS) != appConfig.end()) { std::string flagsStr = appConfig[FLAGS].get(); - if ((ConvertFlagStr(flagsStr) & appProperty->flags) && + if (((ConvertFlagStr(flagsStr) & appProperty->flags) != 0) && bundleName.find("wps") != std::string::npos) { checkFlag = true; } @@ -496,7 +496,7 @@ int32_t SandboxUtils::HandleFlagsPoint(const ClientSocket::AppProperty *appPrope if (flagPoint.find(FLAGS) != flagPoint.end()) { std::string flagsStr = flagPoint[FLAGS].get(); int flag = ConvertFlagStr(flagsStr); - if (appProperty->flags & flag) { + if ((appProperty->flags & flag) != 0) { return DoAllMntPointsMount(appProperty, flagPoint); } } else { -- Gitee From b87107b7e0f614ea40420eff4f9702bdc2a01590 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 25 Jul 2022 11:01:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- standard/appspawn_service.c | 2 +- .../app_spawn_standard_test/app_spawn_standard_test.cpp | 4 ++-- util/src/sandbox_utils.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/standard/appspawn_service.c b/standard/appspawn_service.c index 1042cba2..0c407ae0 100644 --- a/standard/appspawn_service.c +++ b/standard/appspawn_service.c @@ -97,7 +97,7 @@ APPSPAWN_STATIC void AddAppInfo(pid_t pid, const char *processName) APPSPAWN_LOGI("Add %s, pid=%d success", processName, pid); } -APPSPAWN_STATIC void ProcessTimer(const TimerHandle taskHandle) +APPSPAWN_STATIC void ProcessTimer(const TimerHandle taskHandle, void *context) { APPSPAWN_LOGI("timeout stop appspawn"); LE_StopLoop(LE_GetDefaultLoop()); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp index b5578829..a5f55ddb 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp @@ -45,7 +45,7 @@ using nlohmann::json; int OnConnection(const LoopHandle loopHandle, const TaskHandle server); void AddAppInfo(pid_t pid, const char *processName); void OnReceiveRequest(const TaskHandle taskHandle, const uint8_t *buffer, uint32_t buffLen); -void ProcessTimer(const TimerHandle taskHandle); +void ProcessTimer(const TimerHandle taskHandle, void *context); void SignalHandler(const struct signalfd_siginfo *siginfo); void SendMessageComplete(const TaskHandle taskHandle, BufferHandle handle); TaskHandle GetTestClientHandle(); @@ -318,7 +318,7 @@ HWTEST(AppSpawnStandardTest, App_Spawn_Standard_07, TestSize.Level0) SignalHandler(&siginfo); content->content.runAppSpawn(&content->content, 0, nullptr); - ProcessTimer(nullptr); + ProcessTimer(nullptr, nullptr); GTEST_LOG_(INFO) << "App_Spawn_Standard_07 end"; } diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index af237438..7e372420 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -495,7 +495,7 @@ int32_t SandboxUtils::HandleFlagsPoint(const ClientSocket::AppProperty *appPrope if (flagPoint.find(FLAGS) != flagPoint.end()) { std::string flagsStr = flagPoint[FLAGS].get(); - uint32_t flag = ConvertFlagStr(flagsStr); + uint32_t flag = ConvertFlagStr(flagsStr); if ((appProperty->flags & flag) != 0) { return DoAllMntPointsMount(appProperty, flagPoint); } -- Gitee From 6bffebe8a15bc3e61e9331c0725418137a344272 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 25 Jul 2022 14:59:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- util/src/sandbox_utils.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index 5061636b..ed176834 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -366,7 +366,6 @@ int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProper bool checkFlag = false; if (appConfig.find(FLAGS) != appConfig.end()) { - std::string flagsStr = appConfig[FLAGS].get(); if (((ConvertFlagStr(appConfig[FLAGS].get()) & appProperty->flags)) != 0) && bundleName.find("wps") != std::string::npos) { checkFlag = true; -- Gitee From 5258cf33fb044c87e3afe907660ef770a2ce9d8a Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 25 Jul 2022 19:39:54 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- util/src/sandbox_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index ed176834..3c3ae87b 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -366,7 +366,7 @@ int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProper bool checkFlag = false; if (appConfig.find(FLAGS) != appConfig.end()) { - if (((ConvertFlagStr(appConfig[FLAGS].get()) & appProperty->flags)) != 0) && + if (((ConvertFlagStr(appConfig[FLAGS].get()) & appProperty->flags) != 0) && bundleName.find("wps") != std::string::npos) { checkFlag = true; } -- Gitee