diff --git a/frameworks/native/runtime/js_worker.cpp b/frameworks/native/runtime/js_worker.cpp index 97153c4636a72c24250629437393d1126c3da89f..8b772ae849f06add853009295cb364ff660933f6 100644 --- a/frameworks/native/runtime/js_worker.cpp +++ b/frameworks/native/runtime/js_worker.cpp @@ -431,7 +431,10 @@ bool AssetHelper::ReadFilePathData(const std::string& filePath, uint8_t** buff, return flag; } } else { - realfilePath = filePath.substr(pos + 1); + if (pos < std::string::npos) { + pos += 1; + } + realfilePath = filePath.substr(pos); TAG_LOGD(AAFwkTag::JSRUNTIME, "realfilePath: %{private}s", realfilePath.c_str()); int32_t apiTargetVersion = static_cast(workerInfo_->apiTargetVersion.GetOriginPointer()); bool apiSatisfy = apiTargetVersion == 0 || apiTargetVersion > API8; diff --git a/services/abilitymgr/src/pending_want_record.cpp b/services/abilitymgr/src/pending_want_record.cpp index dbdf53c834b9b672fd556905c8c43110afa38b42..aae461f5080f628966028ad925b5b759eb965c8f 100644 --- a/services/abilitymgr/src/pending_want_record.cpp +++ b/services/abilitymgr/src/pending_want_record.cpp @@ -119,7 +119,9 @@ int32_t PendingWantRecord::ExecuteOperation( break; case static_cast(OperationType::START_ABILITIES): { std::vector allWantsInfos = key_->GetAllWantsInfos(); - allWantsInfos.back().want = want; + if (!allWantsInfos.empty()) { + allWantsInfos.back().want = want; + } res = pendingWantManager->PendingWantStartAbilitys( allWantsInfos, senderInfo.startOptions, senderInfo.callerToken, -1, callerUid_, callerTokenId_); break;