openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-25 12:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: check nullptr

Browse Source 
Signed-off-by: yangxuguang-huawei <yangxuguang3@huawei.com>
This commit is contained in:
yangxuguang-huawei
2024-07-16 09:51:06 +08:00
parent 00f2967f84
commit 326e99aa00
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/ability_runtime/js_ability_context.cpp
+7 -6
View File
@@ -628,14 +628,15 @@ napi_value JsAbilityContext::OnOpenLinkInner(napi_env env, const AAFwk::Want& wa
TAG_LOGI(AAFwkTag::CONTEXT, "OpenLink succeeded.");
return;
}
if (freeInstallObserver_ == nullptr) {
TAG_LOGE(AAFwkTag::CONTEXT, "freeInstallObserver_ is nullptr.");
RemoveOpenLinkTask(requestCode);
return;
}
if (*innerErrorCode == AAFwk::ERR_OPEN_LINK_START_ABILITY_DEFAULT_OK) {
TAG_LOGI(AAFwkTag::CONTEXT, "start ability by default succeeded.");
if (freeInstallObserver_ != nullptr) {
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, ERR_OK);
return;
}
TAG_LOGE(AAFwkTag::CONTEXT, "freeInstallObserver_ is nullptr.");
*innerErrorCode = static_cast<int>(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT);
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, ERR_OK);
return;
}
TAG_LOGI(AAFwkTag::CONTEXT, "OpenLink failed.");
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, *innerErrorCode);
frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp
+7 -6
View File
@@ -349,14 +349,15 @@ napi_value JsUIExtensionContext::OnOpenLinkInner(napi_env env, const AAFwk::Want
TAG_LOGI(AAFwkTag::UI_EXT, "OpenLink succeeded.");
return;
}
if (freeInstallObserver_ == nullptr) {
TAG_LOGE(AAFwkTag::UI_EXT, "freeInstallObserver_ is nullptr.");
RemoveOpenLinkTask(requestCode);
return;
}
if (*innerErrorCode == AAFwk::ERR_OPEN_LINK_START_ABILITY_DEFAULT_OK) {
TAG_LOGI(AAFwkTag::UI_EXT, "start ability by default succeeded.");
if (freeInstallObserver_ != nullptr) {
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, ERR_OK);
return;
}
TAG_LOGE(AAFwkTag::UI_EXT, "freeInstallObserver_ is nullptr.");
*innerErrorCode = static_cast<int>(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT);
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, ERR_OK);
return;
}
TAG_LOGI(AAFwkTag::UI_EXT, "OpenLink failed.");
freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, *innerErrorCode);
services/abilitymgr/src/ability_manager_stub.cpp
+4
View File
@@ -3949,6 +3949,10 @@ int32_t AbilityManagerStub::PreStartMissionInner(MessageParcel &data, MessagePar
int32_t AbilityManagerStub::OpenLinkInner(MessageParcel &data, MessageParcel &reply)
{
sptr<Want> want = data.ReadParcelable<Want>();
if (want == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "want is nullptr.");
return ERR_INVALID_VALUE;
}
sptr<IRemoteObject> callerToken = data.ReadRemoteObject();
int32_t userId = data.ReadInt32();
int requestCode = data.ReadInt32();
test/fuzztest/abilitymanagerservicefifth_fuzzer/abilitymanagerservicefifth_fuzzer.cpp
+1
View File
@@ -88,6 +88,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
abilityms->DoAbilityBackground(token, uint32Param);
abilityms->DelegatorMoveMissionToFront(int32Param);
abilityms->UpdateCallerInfo(*want, token);
abilityms->OpenLink(*want, token, int32Param, int32Param);
abilityms->JudgeMultiUserConcurrency(int32Param);
#ifdef ABILITY_COMMAND_FOR_TEST
abilityms->ForceTimeoutForTest(stringParam, stringParam);