From 1756b28947e9993850c9938dea505d2a61d920ec Mon Sep 17 00:00:00 2001 From: chengjinsong Date: Mon, 17 Oct 2022 18:10:10 +0800 Subject: [PATCH] codex Signed-off-by: chengjinsong --- interfaces/innerkits/syspara/param_comm.c | 2 +- .../kits/jskits/src_v9/native_parameters_js.cpp | 12 ++++++------ .../seccomp/scripts/generate_code_from_policy.py | 1 - test/exec_test/server.c | 4 +--- .../systemtraversalparameter_fuzzer.cpp | 2 +- test/unittest/init/loopevent_unittest.cpp | 2 +- test/unittest/init/sandbox_unittest.cpp | 1 + test/unittest/param/client_unittest.cpp | 1 + test/unittest/param/param_stub.cpp | 6 +++--- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/interfaces/innerkits/syspara/param_comm.c b/interfaces/innerkits/syspara/param_comm.c index c1a7e7ef..d7411765 100644 --- a/interfaces/innerkits/syspara/param_comm.c +++ b/interfaces/innerkits/syspara/param_comm.c @@ -183,7 +183,7 @@ INIT_LOCAL_API int GetDevUdid_(char *udid, int size) return EC_FAILURE; } - uint32_t len = size; + uint32_t len = (uint32_t)size; int ret = SystemGetParameter("const.product.udid", udid, &len); BEGET_CHECK(ret != 0, return ret); diff --git a/interfaces/kits/jskits/src_v9/native_parameters_js.cpp b/interfaces/kits/jskits/src_v9/native_parameters_js.cpp index 16168307..bca5d457 100644 --- a/interfaces/kits/jskits/src_v9/native_parameters_js.cpp +++ b/interfaces/kits/jskits/src_v9/native_parameters_js.cpp @@ -107,13 +107,13 @@ static void SetCallbackWork(napi_env env, StorageAsyncContextPtr asyncContext) napi_create_async_work( env, nullptr, resource, [](napi_env env, void *data) { - StorageAsyncContext *asyncContext = (StorageAsyncContext *)data; + StorageAsyncContext *asyncContext = reinterpret_cast(data); asyncContext->status = SetParameter(asyncContext->key, asyncContext->value); PARAM_JS_LOGV("JSApp set status: %d, key: '%s', value: '%s'.", asyncContext->status, asyncContext->key, asyncContext->value); }, [](napi_env env, napi_status status, void *data) { - StorageAsyncContext *asyncContext = (StorageAsyncContext *)data; + StorageAsyncContext *asyncContext = reinterpret_cast(data); napi_value result[ARGC_NUMBER] = { 0 }; if (asyncContext->status == 0) { napi_get_undefined(env, &result[0]); @@ -139,7 +139,7 @@ static void SetCallbackWork(napi_env env, StorageAsyncContextPtr asyncContext) napi_delete_async_work(env, asyncContext->work); delete asyncContext; }, - (void *)asyncContext, &asyncContext->work); + reinterpret_cast(asyncContext), &asyncContext->work); napi_queue_async_work(env, asyncContext->work); } @@ -285,7 +285,7 @@ static void GetCallbackWork(napi_env env, StorageAsyncContextPtr asyncContext) napi_create_async_work( env, nullptr, resource, [](napi_env env, void *data) { - StorageAsyncContext *asyncContext = (StorageAsyncContext *)data; + StorageAsyncContext *asyncContext = reinterpret_cast(data); std::vector value(MAX_VALUE_LENGTH, 0); asyncContext->status = GetParameter(asyncContext->key, (asyncContext->valueLen == 0) ? nullptr : asyncContext->value, value.data(), MAX_VALUE_LENGTH); @@ -294,7 +294,7 @@ static void GetCallbackWork(napi_env env, StorageAsyncContextPtr asyncContext) asyncContext->status, asyncContext->key, asyncContext->getValue.c_str(), asyncContext->value); }, [](napi_env env, napi_status status, void *data) { - StorageAsyncContext *asyncContext = (StorageAsyncContext *)data; + StorageAsyncContext *asyncContext = reinterpret_cast(data); napi_value result[ARGC_NUMBER] = { 0 }; if (asyncContext->status > 0) { napi_get_undefined(env, &result[0]); @@ -321,7 +321,7 @@ static void GetCallbackWork(napi_env env, StorageAsyncContextPtr asyncContext) napi_delete_async_work(env, asyncContext->work); delete asyncContext; }, - (void *)asyncContext, &asyncContext->work); + reinterpret_cast(asyncContext), &asyncContext->work); napi_queue_async_work(env, asyncContext->work); } diff --git a/services/modules/seccomp/scripts/generate_code_from_policy.py b/services/modules/seccomp/scripts/generate_code_from_policy.py index 0d40f3a0..4e31c2c1 100755 --- a/services/modules/seccomp/scripts/generate_code_from_policy.py +++ b/services/modules/seccomp/scripts/generate_code_from_policy.py @@ -570,7 +570,6 @@ class GenBpfPolicy: return bpf_policy - #parse (argn & mask) == value def compile_mask_equal_atom(self, atom, cur_size): bpf_policy = [] left_brace_pos = atom.find('(') diff --git a/test/exec_test/server.c b/test/exec_test/server.c index 88eb0cfc..aa7d09c6 100644 --- a/test/exec_test/server.c +++ b/test/exec_test/server.c @@ -20,7 +20,6 @@ int main(int argc, char* argv[]) { - int ret = 0; int sockFd = GetControlSocket("serversock"); if (sockFd < 0) { INIT_LOGE("Failed to get server socket"); @@ -28,8 +27,7 @@ int main(int argc, char* argv[]) } char buffer[MAX_BUFFER_SIZE] = { 0 }; while (1) { - ret = read(sockFd, buffer, sizeof(buffer) - 1); - if (ret > 0) { + if (read(sockFd, buffer, sizeof(buffer) - 1) > 0) { INIT_LOGI("Read message: %s", buffer); (void)memset_s(buffer, MAX_BUFFER_SIZE, 0, MAX_BUFFER_SIZE); } diff --git a/test/fuzztest/systemtraversalparameter_fuzzer/systemtraversalparameter_fuzzer.cpp b/test/fuzztest/systemtraversalparameter_fuzzer/systemtraversalparameter_fuzzer.cpp index 30b4d7bb..4a68ac74 100644 --- a/test/fuzztest/systemtraversalparameter_fuzzer/systemtraversalparameter_fuzzer.cpp +++ b/test/fuzztest/systemtraversalparameter_fuzzer/systemtraversalparameter_fuzzer.cpp @@ -40,7 +40,7 @@ namespace OHOS { CloseStdout(); Cookie instance = {0, nullptr}; Cookie *cookie = &instance; - if (size <= 0) { + if (size == 0) { return false; } if (size > PARAM_CONST_VALUE_LEN_MAX + PARAM_NAME_LEN_MAX) { diff --git a/test/unittest/init/loopevent_unittest.cpp b/test/unittest/init/loopevent_unittest.cpp index dfeb208a..caa1deaa 100644 --- a/test/unittest/init/loopevent_unittest.cpp +++ b/test/unittest/init/loopevent_unittest.cpp @@ -198,8 +198,8 @@ public: LE_BaseInfo info = {TASK_EVENT, NULL}; int testfd = 65535; // 65535 is not exist fd BaseTask *task = CreateTask(LE_GetDefaultLoop(), testfd, &info, sizeof(StreamClientTask)); - task->handleEvent = TestHandleTaskEvent; if (task != nullptr) { + task->handleEvent = TestHandleTaskEvent; ProcessEvent((EventLoop *)LE_GetDefaultLoop(), testfd, Event_Read); } ((HashTab *)(((EventLoop *)LE_GetDefaultLoop())->taskMap))->nodeFree(&task->hashNode); diff --git a/test/unittest/init/sandbox_unittest.cpp b/test/unittest/init/sandbox_unittest.cpp index 9f31f931..d8dfc785 100644 --- a/test/unittest/init/sandbox_unittest.cpp +++ b/test/unittest/init/sandbox_unittest.cpp @@ -155,6 +155,7 @@ bool MakeFileByJson(cJSON * mJson, const char *sandboxFileName) int ret1 = write(fd, cjValue1, strlen(cjValue1)); if (-1 == ret1) { std::cout << "Write file ERROR" << errno << " fd is :" << fd << std::endl; + close(fd); return false; } free(cjValue1); diff --git a/test/unittest/param/client_unittest.cpp b/test/unittest/param/client_unittest.cpp index 92e1c629..66b6b956 100644 --- a/test/unittest/param/client_unittest.cpp +++ b/test/unittest/param/client_unittest.cpp @@ -110,6 +110,7 @@ static void TestPermission() int ret; ParamSecurityOps *paramSecurityOps = GetParamSecurityOps(0); + EXPECT_NE(paramSecurityOps, nullptr); paramSecurityOps->securityCheckParamPermission = TestCheckParamPermission; SetTestPermissionResult(DAC_RESULT_FORBIDED); if ((GetParamSecurityLabel() != nullptr)) { diff --git a/test/unittest/param/param_stub.cpp b/test/unittest/param/param_stub.cpp index b2fefe12..3ca37a1c 100644 --- a/test/unittest/param/param_stub.cpp +++ b/test/unittest/param/param_stub.cpp @@ -55,7 +55,7 @@ static int TestGenHashCode(const char *buff) static void TestSetSelinuxLogCallback(void) {} -static const char *forbidWriteParamName[] = { +static const char *g_forbidWriteParamName[] = { "ohos.servicectrl.", "test.permission.read", "test.persmission.watch" @@ -64,8 +64,8 @@ static const char *forbidWriteParamName[] = { static int TestSetParamCheck(const char *paraName, const char *context, const SrcInfo *info) { // forbid to read ohos.servicectrl. - for (size_t i = 0; i < ARRAY_LENGTH(forbidWriteParamName); i++) { - if (strncmp(paraName, forbidWriteParamName[i], strlen(forbidWriteParamName[i])) == 0) { + for (size_t i = 0; i < ARRAY_LENGTH(g_forbidWriteParamName); i++) { + if (strncmp(paraName, g_forbidWriteParamName[i], strlen(g_forbidWriteParamName[i])) == 0) { return g_testPermissionResult; } } -- GitLab