diff --git a/frameworks/js/napi/inputmethodclient/js_get_input_method_controller.cpp b/frameworks/js/napi/inputmethodclient/js_get_input_method_controller.cpp index bdc70ff562dce80748a15e9a87208426d5a58c71..4713c0cbebfc6e1c9fbf4a8ed516888c97c0ccc9 100644 --- a/frameworks/js/napi/inputmethodclient/js_get_input_method_controller.cpp +++ b/frameworks/js/napi/inputmethodclient/js_get_input_method_controller.cpp @@ -755,8 +755,8 @@ napi_value JsGetInputMethodController::DiscardTypingText(napi_env env, napi_call { InputMethodSyncTrace tracer("JsGetInputMethodController_DiscardTypingText"); return HandleSoftKeyboard( - env, info - , [] { + env, info, + [] { auto instance = InputMethodController::GetInstance(); if (instance == nullptr) { IMSA_HILOGE("GetInstance return nullptr!"); diff --git a/services/adapter/settings_data_provider/src/enable_upgrade_manager.cpp b/services/adapter/settings_data_provider/src/enable_upgrade_manager.cpp index dfade989140f03ad9f980b358432cef6fd860c77..ef2dfc391dc6d42d6e2c0abab1fc10c72a7c28e9 100644 --- a/services/adapter/settings_data_provider/src/enable_upgrade_manager.cpp +++ b/services/adapter/settings_data_provider/src/enable_upgrade_manager.cpp @@ -131,7 +131,8 @@ int32_t EnableUpgradeManager::ParseEnabledTable( int32_t EnableUpgradeManager::GetFullExperienceTable(int32_t userId, std::set &bundleNames) { std::string content; - int32_t ret = SettingsDataUtils::GetInstance().GetStringValue(SETTING_URI_PROXY, SettingsDataUtils::SECURITY_MODE, content); + int32_t ret = SettingsDataUtils::GetInstance().GetStringValue(SETTING_URI_PROXY, + SettingsDataUtils::SECURITY_MODE, content); if (ret != ErrorCode::NO_ERROR) { IMSA_HILOGW("%{public}d get full experience table failed:%{public}d.", userId, ret); return ret; diff --git a/test/fuzztest/imeenabledinfomanager_fuzzer/imeenabledinfomanager_fuzzer.cpp b/test/fuzztest/imeenabledinfomanager_fuzzer/imeenabledinfomanager_fuzzer.cpp index 9abace6a71d92d2c7ea32fca525f032df33bc22d..85348936b85132ccf4831038c18d477662461717 100644 --- a/test/fuzztest/imeenabledinfomanager_fuzzer/imeenabledinfomanager_fuzzer.cpp +++ b/test/fuzztest/imeenabledinfomanager_fuzzer/imeenabledinfomanager_fuzzer.cpp @@ -19,6 +19,7 @@ using namespace OHOS::MiscServices; namespace OHOS { +const int8_t EVEN_CHECK_NUMBER = 2; std::string GetString(const uint8_t *data, size_t size) { if (data == nullptr || size == 0) { @@ -122,7 +123,7 @@ void FuzzSetCurrentIme(const uint8_t *data, size_t size) auto userId = static_cast(size); auto fuzzedString = GetString(data, size); std::string imeId = fuzzedString; - if (size % 2 == 0) { + if (size % EVEN_CHECK_NUMBER == 0) { imeId = fuzzedString + "/" + "ext"; } bool isSetByUser = false; @@ -137,7 +138,7 @@ void FuzzSetTmpIme(const uint8_t *data, size_t size) auto userId = static_cast(size); auto fuzzedString = GetString(data, size); std::string imeId = fuzzedString; - if (size % 2 == 0) { + if (size % EVEN_CHECK_NUMBER == 0) { imeId = fuzzedString + "/" + "ext"; } ImeEnabledInfoManager::GetInstance().SetTmpIme(userId, imeId); diff --git a/test/fuzztest/inputmethodability_fuzzer/inputmethodability_fuzzer.cpp b/test/fuzztest/inputmethodability_fuzzer/inputmethodability_fuzzer.cpp index 002874337af20ba50e16b27c975beab377ea46ca..71f913c706f91a9600424a276f8c182c1942301f 100644 --- a/test/fuzztest/inputmethodability_fuzzer/inputmethodability_fuzzer.cpp +++ b/test/fuzztest/inputmethodability_fuzzer/inputmethodability_fuzzer.cpp @@ -198,6 +198,9 @@ void TestInterfaceCoverage(int32_t dataInt32, bool dataBool, std::u16string &tex extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* Run your code on data */ + if (data == nullptr || size == 0) { + return false; + } std::string fuzzedString(reinterpret_cast(data), size); auto fuzzedInt32 = static_cast(size); auto fuzzedUint64 = static_cast(size); @@ -208,11 +211,23 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) } auto fuzzedBool = static_cast(data[0] % 2); - uint64_t dataValue; - memcpy(&dataValue, data, sizeof(uint64_t)); + uint64_t dataValue { 0 }; + if (size < sizeof(uint64_t)) { + return false; + } + + if (memcpy_s(&dataValue, sizeof(dataValue), data, sizeof(uint64_t)) != EOK) { + return false; + } + + int32_t int32Value { 0 }; + if (size < sizeof(int32_t)) { + return false; + } - int32_t int32Value; - memcpy(&int32Value, data, sizeof(int32_t)); + if (memcpy_s(&int32Value, sizeof(int32Value), data, sizeof(int32_t)) != EOK) { + return false; + } std::u16string fuzzedU16String = u"insert text"; diff --git a/test/fuzztest/inputmethodsystemability_fuzzer/inputmethodsystemability_fuzzer.cpp b/test/fuzztest/inputmethodsystemability_fuzzer/inputmethodsystemability_fuzzer.cpp index 0fa0496a9a9a2d42c3a7d0a22d8c3f3bd9fd68a5..ae56b0d91a54d3d8a85ba7dcd575801d9a3d8c4e 100644 --- a/test/fuzztest/inputmethodsystemability_fuzzer/inputmethodsystemability_fuzzer.cpp +++ b/test/fuzztest/inputmethodsystemability_fuzzer/inputmethodsystemability_fuzzer.cpp @@ -141,7 +141,8 @@ void FuzzHandleOperation(const uint8_t *data, size_t size) DelayedSingleton::GetInstance()->HandleWmsConnected(fuzzedInt32, fuzzedInt32); DelayedSingleton::GetInstance()->HandleScbStarted(fuzzedInt32, fuzzedInt32); DelayedSingleton::GetInstance()->HandleWmsDisconnected(fuzzedInt32, fuzzedInt32); - DelayedSingleton::GetInstance()->NeedHideWhenSwitchInputType(fuzzedInt32, inputType, fuzzedBool); + DelayedSingleton::GetInstance()->NeedHideWhenSwitchInputType(fuzzedInt32, inputType, + fuzzedBool); DelayedSingleton::GetInstance()->GetAlternativeIme(fuzzedInt32, fuzzedString); } } // namespace OHOS diff --git a/test/unittest/cpp_test/mock/os_account_adapter.cpp b/test/unittest/cpp_test/mock/os_account_adapter.cpp index 823adf046fa61efe07d5a3726c78d0b6259db84a..613ed42dea3058cb847448f979b1d98f93d18e07 100644 --- a/test/unittest/cpp_test/mock/os_account_adapter.cpp +++ b/test/unittest/cpp_test/mock/os_account_adapter.cpp @@ -26,7 +26,7 @@ bool OsAccountAdapter::IsOsAccountForeground(int32_t userId) std::vector OsAccountAdapter::QueryActiveOsAccountIds() { std::vector userIds; - userIds.push_back(100); + userIds.push_back(MAIN_USER_ID); return userIds; } diff --git a/tools/ime/src/input_method_manager_command.cpp b/tools/ime/src/input_method_manager_command.cpp index 67268f709fa4f81861faa7483549639634db746c..1f7930c157a23ecd50b329a0e2321701849938bf 100644 --- a/tools/ime/src/input_method_manager_command.cpp +++ b/tools/ime/src/input_method_manager_command.cpp @@ -24,7 +24,7 @@ namespace MiscServices { static std::string EnabledStatusToString(EnabledStatus status) { - switch(status) { + switch (status) { case EnabledStatus::DISABLED: return "DISABLED"; case EnabledStatus::BASIC_MODE: @@ -46,7 +46,7 @@ bool ValidateImeExists(const std::string& bundle) } controller->ListInputMethod(methods); for (const auto& m : methods) { - if(m.name == bundle){ + if (m.name == bundle) { return true; } }