mirror of
https://github.com/openharmony/ability_ability_runtime.git
synced 2026-08-24 22:21:36 -04:00
!17160 merge REA into OpenHarmony-6.0-Release
fix ui_extension Created-by: RuiChen_01 Commit-by: RuiChen_01 Merged-by: openharmony_ci Description: **IssueNo**: **Description**: **稳定性自检：** | 自检项 | 自检结果 | | ------------------------------------------------------------ | -------- | | 涉及跨进程调用的相关操作需要抛至主线程或加锁防止并发 | y | | 成员变量进行赋值或创建需要排查并发 | y | | 谨慎在lambda表达式中使用引用捕获 | y | | 谨慎在未经拷贝的情况下使用外部传入的string、C字符串 | y | | map\vector\list\set等stl模板类使用时需要排查并发 | y | | 谨慎考虑加锁范围 | y | | 在IPC通信中谨慎使用同步通信方式 | y | | 禁止传递this指针至其他模块或线程（特别是eventhandler任务） | y | | 禁止将外部传入的裸指针在内部直接构造智能指针 | y | | 禁止多个独立创建的智能指针管理同一地址 | y | | 禁止在析构函数中抛异步任务 | y | | 禁止js对象在非js线程（例如在IPC线程）创建、使用或销毁 | y | | 禁止在对外接口中未经判空直接使用外部传入的指针 | y | | 禁止接口返回局部变量引用 | y | | 禁止在信号函数中加锁 | y | | 禁止在关键流程（SA启动、应用启动等主流程）执行耗时的操作 | y | | 禁止将同一个cpp编译在不同的so中 | y | **安全编码自检：** | 自检项 | 自检结果 | | -------------------------------------------------------------- | -------- | | 裸指针避免通过隐式转换构造为sptr | y | | json对象在取值之前必须先判断类型，避免类型不匹配 |y | | 序列化时必须对传入的数组大小进行校验，避免出现超大数组 |y | | 避免使用未明确位宽的整型，选择使用int8_t、uint8_t等类型 | y | | 外部传入的路径要做规范化校验，对路径中的.、..、../等特殊字符严格校验 | y | | 指针变量、表示资源描述符的变量、bool变量必须赋初值 | y | | readParcelable获取的对象使用前需要判空 | y | | 分配和释放内存的函数需要成对出现 | y | | 申请内存后异常退出前需要及时进行内存释放 | y | | 内存申请前必须对内存大小进行合法性校验 | y | | 内存分配后必须判断是否成功 | y | | 禁止使用realloc、alloca函数 | y | | 禁止打印文件路径、口令等敏感信息，如有需要，使用private修饰 | y | | 禁止打印内存地址 | y | | 整数之间运算时必须严格检查，确保不会出现溢出、反转、除0 | y | | 禁止对有符号整数进行位操作符运算 | y | | 禁止对指针进行逻辑或位运算 | y | | 循环次数如果收外部数据控制，需要检验其合法性 | y | | 禁止使用内存操作类危险函数，需要使用安全函数 | y | | 谨慎使用不可重入函数 | y | | 必须检查安全函数的返回值，并进行正确处理 |y | | 禁止仅通过TokenType类型判断绕过权限校验 | y | **TDD Result**: 不涉及 **XTS Result**: 不涉及 ### 是否已执行L0用例 - [√] 已验证 - [ ] 不涉及。如不涉及，请写明理由 See merge request: openharmony/ability_ability_runtime!17160
This commit is contained in:
openharmony_ci
@@ -224,30 +224,35 @@ void UIExtension::OnInsightIntentExecuteDone(const sptr<AAFwk::SessionInfo> &ses
|
||||
if (res != uiWindowMap_.end() && res->second != nullptr) {
|
||||
WantParams params;
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT_CODE, AAFwk::Integer::Box(result.innerErr));
|
||||
WantParams resultParams;
|
||||
resultParams.SetParam("code", AAFwk::Integer::Box(result.code));
|
||||
if (result.result != nullptr) {
|
||||
|
||||
Rosen::WMError ret = Rosen::WMError::WM_OK;
|
||||
if (result.isDecorator && result.result) {
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(*result.result);
|
||||
if (pWantParams != nullptr) {
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT, pWantParams);
|
||||
ret = res->second->TransferExtensionData(params);
|
||||
} else {
|
||||
WantParams resultParams;
|
||||
resultParams.SetParam("code", AAFwk::Integer::Box(result.code));
|
||||
if (result.result != nullptr) {
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(*result.result);
|
||||
resultParams.SetParam("result", pWantParams);
|
||||
}
|
||||
}
|
||||
auto size = result.uris.size();
|
||||
sptr<IArray> uriArray = new (std::nothrow) Array(size, g_IID_IString);
|
||||
if (uriArray == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UI_EXT, "new uriArray failed");
|
||||
return;
|
||||
}
|
||||
for (std::size_t i = 0; i < size; i++) {
|
||||
uriArray->Set(i, String::Box(result.uris[i]));
|
||||
}
|
||||
resultParams.SetParam("uris", uriArray);
|
||||
resultParams.SetParam("flags", AAFwk::Integer::Box(result.flags));
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(resultParams);
|
||||
if (pWantParams != nullptr) {
|
||||
auto size = result.uris.size();
|
||||
sptr<IArray> uriArray = new (std::nothrow) Array(size, g_IID_IString);
|
||||
if (uriArray == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UI_EXT, "new uriArray failed");
|
||||
return;
|
||||
}
|
||||
for (std::size_t i = 0; i < size; i++) {
|
||||
uriArray->Set(i, String::Box(result.uris[i]));
|
||||
}
|
||||
resultParams.SetParam("uris", uriArray);
|
||||
resultParams.SetParam("flags", AAFwk::Integer::Box(result.flags));
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(resultParams);
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT, pWantParams);
|
||||
|
||||
ret = res->second->TransferExtensionData(params);
|
||||
}
|
||||
Rosen::WMError ret = res->second->TransferExtensionData(params);
|
||||
if (ret == Rosen::WMError::WM_OK) {
|
||||
TAG_LOGD(AAFwkTag::UI_EXT, "TransferExtensionData success");
|
||||
} else {
|
||||
|
||||
@@ -625,31 +625,36 @@ void JsUIExtensionBase::OnInsightIntentExecuteDone(const sptr<AAFwk::SessionInfo
|
||||
if (res != uiWindowMap_.end() && res->second != nullptr) {
|
||||
WantParams params;
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT_CODE, Integer::Box(result.innerErr));
|
||||
WantParams resultParams;
|
||||
resultParams.SetParam("code", Integer::Box(result.code));
|
||||
if (result.result != nullptr) {
|
||||
|
||||
Rosen::WMError ret = Rosen::WMError::WM_OK;
|
||||
if (result.isDecorator && result.result) {
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(*result.result);
|
||||
if (pWantParams != nullptr) {
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT, pWantParams);
|
||||
ret = res->second->TransferExtensionData(params);
|
||||
} else {
|
||||
WantParams resultParams;
|
||||
resultParams.SetParam("code", Integer::Box(result.code));
|
||||
if (result.result != nullptr) {
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(*result.result);
|
||||
resultParams.SetParam("result", pWantParams);
|
||||
}
|
||||
}
|
||||
auto size = result.uris.size();
|
||||
sptr<IArray> uriArray = new (std::nothrow) Array(size, g_IID_IString);
|
||||
if (uriArray == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UI_EXT, "new uriArray failed");
|
||||
return;
|
||||
}
|
||||
for (std::size_t i = 0; i < size; i++) {
|
||||
uriArray->Set(i, String::Box(result.uris[i]));
|
||||
}
|
||||
resultParams.SetParam("uris", uriArray);
|
||||
resultParams.SetParam("flags", Integer::Box(result.flags));
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(resultParams);
|
||||
if (pWantParams != nullptr) {
|
||||
auto size = result.uris.size();
|
||||
sptr<IArray> uriArray = new (std::nothrow) Array(size, g_IID_IString);
|
||||
if (uriArray == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UI_EXT, "new uriArray failed");
|
||||
return;
|
||||
}
|
||||
for (std::size_t i = 0; i < size; i++) {
|
||||
uriArray->Set(i, String::Box(result.uris[i]));
|
||||
}
|
||||
resultParams.SetParam("uris", uriArray);
|
||||
resultParams.SetParam("flags", Integer::Box(result.flags));
|
||||
sptr<AAFwk::IWantParams> pWantParams = WantParamWrapper::Box(resultParams);
|
||||
params.SetParam(INSIGHT_INTENT_EXECUTE_RESULT, pWantParams);
|
||||
|
||||
ret = res->second->TransferExtensionData(params);
|
||||
}
|
||||
|
||||
Rosen::WMError ret = res->second->TransferExtensionData(params);
|
||||
if (ret == Rosen::WMError::WM_OK) {
|
||||
TAG_LOGD(AAFwkTag::UI_EXT, "TransferExtensionData success");
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user