From 692175d543bb8dec7e926970f86b5221377fd97b Mon Sep 17 00:00:00 2001
From: zhenghui <zhenghui25@huawei.com>
Date: Sat, 31 Aug 2024 11:08:05 +0800
Subject: [PATCH] fix bug in fuzz and ut

Signed-off-by: zhenghui <zhenghui25@huawei.com>
---
 services/local_code_sign/src/local_code_sign_service.cpp    | 4 ++++
 .../initlocalcertificatestub_fuzzer.cpp                     | 1 +
 .../signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp   | 1 +
 test/unittest/BUILD.gn                                      | 6 +++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/services/local_code_sign/src/local_code_sign_service.cpp b/services/local_code_sign/src/local_code_sign_service.cpp
index 243d1ac..d518c19 100644
--- a/services/local_code_sign/src/local_code_sign_service.cpp
+++ b/services/local_code_sign/src/local_code_sign_service.cpp
@@ -93,6 +93,10 @@ void LocalCodeSignService::DelayUnloadTask()
 void LocalCodeSignService::OnStop()
 {
     LOG_INFO("LocalCodeSignService OnStop");
+    if (unloadHandler_ != nullptr) {
+        unloadHandler_->RemoveTask(TASK_ID);
+        unloadHandler_ = nullptr;
+    }
     state_ = ServiceRunningState::STATE_NOT_START;
 }
 
diff --git a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
index e4bfcdd..7405cbd 100644
--- a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
+++ b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/initlocalcertificatestub_fuzzer.cpp
@@ -59,6 +59,7 @@ namespace OHOS {
         uint64_t selfTokenId = NativeTokenSet("key_enable");
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStart();
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnRemoteRequest(code, datas, reply, option);
+        DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStop();
         NativeTokenReset(selfTokenId);
         return true;
     }
diff --git a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
index f3778ae..f7583a2 100644
--- a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
+++ b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp
@@ -59,6 +59,7 @@ namespace OHOS {
         uint64_t selfTokenId = NativeTokenSet("compiler_service");
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStart();
         DelayedSingleton<LocalCodeSignService>::GetInstance()->OnRemoteRequest(code, datas, reply, option);
+        DelayedSingleton<LocalCodeSignService>::GetInstance()->OnStop();
         NativeTokenReset(selfTokenId);
         return true;
     }
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index abdcf51..3da8fb1 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -64,8 +64,12 @@ ohos_unittest("code_sign_utils_unittest") {
     "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils",
   ]
 
+  defines = []
   if (!is_asan && !use_clang_coverage) {
-    defines = [ "NO_USE_CLANG_COVERAGE" ]
+    defines += [ "NO_USE_CLANG_COVERAGE" ]
+  }
+  if (code_signature_support_oh_code_sign) {
+    defines += [ "SUPPORT_OH_CODE_SIGN" ]
   }
 
   include_dirs = [
-- 
Gitee