diff --git a/frameworks/simulator/ability_simulator/src/ability_context.cpp b/frameworks/simulator/ability_simulator/src/ability_context.cpp index 4a65ef0e71..9b83dd6f86 100644 --- a/frameworks/simulator/ability_simulator/src/ability_context.cpp +++ b/frameworks/simulator/ability_simulator/src/ability_context.cpp @@ -266,7 +266,6 @@ bool AbilityContext::CreateMultiDir(const std::string &path) std::string::size_type pos = 0; std::string::size_type prePos = 0; std::string strFolderPath; - std::string stdFolderPath; while ((pos = tempStr.find(fileSeparator_, pos)) != std::string::npos) { strFolderPath = tempStr.substr(0, pos); diff --git a/service_router_framework/interfaces/inner_api/src/service_info.cpp b/service_router_framework/interfaces/inner_api/src/service_info.cpp index dab7697a1b..a40c683acd 100755 --- a/service_router_framework/interfaces/inner_api/src/service_info.cpp +++ b/service_router_framework/interfaces/inner_api/src/service_info.cpp @@ -96,6 +96,10 @@ bool BusinessAbilityInfo::ReadFromParcel(Parcel &parcel) int32_t size; READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, size); CONTAINER_SECURITY_VERIFY(parcel, size, &permissions); + if (size > CYCLE_LIMIT) { + APP_LOGE("size is too large."); + return false; + } for (int32_t i = 0; i < size; i++) { permissions.emplace_back(Str16ToStr8(parcel.ReadString16())); } diff --git a/services/common/src/event_report.cpp b/services/common/src/event_report.cpp index 77faea0764..2d6e6cb188 100644 --- a/services/common/src/event_report.cpp +++ b/services/common/src/event_report.cpp @@ -163,6 +163,7 @@ void EventReport::SendAppEvent(const EventName &eventName, HiSysEventType type, EVENT_KEY_VERSION_CODE, eventInfo.versionCode, EVENT_KEY_PROCESS_NAME, eventInfo.processName, EVENT_KEY_CALLER_BUNDLE_NAME, eventInfo.callerBundleName); + break; default: HiSysEventWrite( HiSysEvent::Domain::AAFWK, diff --git a/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp b/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp index 9d3a852ce9..bc5fad4ab7 100755 --- a/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp +++ b/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp @@ -83,7 +83,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) abilityConnectManager->StartAbility(abilityRequest); sptr token = GetFuzzAbilityToken(); abilityConnectManager->TerminateAbility(token); - std::shared_ptr caller = GetFuzzAbilityRecord(); abilityConnectManager->StopServiceAbility(abilityRequest); abilityConnectManager->StartAbilityLocked(abilityRequest); abilityConnectManager->TerminateAbilityLocked(token); diff --git a/test/fuzztest/abilitycontext_fuzzer/abilitycontext_fuzzer.cpp b/test/fuzztest/abilitycontext_fuzzer/abilitycontext_fuzzer.cpp index db997eeef2..484e4e15c6 100644 --- a/test/fuzztest/abilitycontext_fuzzer/abilitycontext_fuzzer.cpp +++ b/test/fuzztest/abilitycontext_fuzzer/abilitycontext_fuzzer.cpp @@ -110,7 +110,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) int themeId = static_cast(GetU32Data(data)); abilityContext.SetTheme(themeId); abilityContext.GetColor(resId); - int startId = static_cast(GetU32Data(data)); abilityContext.SetColorMode(mode); std::vector wants; abilityContext.StartAbilities(wants);