openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 01:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!39169 修复拖拽支持capi在GetUdmfData和SetPixelMaps的crash现象

Browse Source 
Merge pull request !39169 from Zhang Jinyu/crashfix
This commit is contained in:
openharmony_ci 2024-07-30 02:39:25 +00:00 committed by Gitee
commit dd83d723ec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
interfaces/native/event/drag_and_drop_impl.cpp
View File

@ -67,7 +67,12 @@ int32_t OH_ArkUI_DragEvent_GetUdmfData(ArkUI_DragEvent* event, OH_UdmfData* data
{
auto dragEvent = reinterpret_cast<ArkUIDragEvent*>(event);
if (!event || !(dragEvent->unifiedData) || !data) {
if (!event || !dragEvent || (dragEvent->unifiedData == nullptr) || !data) {
return ARKUI_ERROR_CODE_PARAM_INVALID;
}
auto rawData = reinterpret_cast<OH_UdmfData*>(dragEvent->unifiedData);
auto raw = dynamic_cast<OH_UdmfData*>(rawData);
if (raw) {
return ARKUI_ERROR_CODE_PARAM_INVALID;
}
auto unifiedData =
@ -166,7 +171,7 @@ int32_t OH_ArkUI_DragAction_SetPointerId(ArkUI_DragAction* dragAction, int32_t p
int32_t OH_ArkUI_DragAction_SetPixelMaps(ArkUI_DragAction* dragAction, OH_PixelmapNative* pixelmapArray[], int32_t size)
{
if (!dragAction) {
if (!dragAction || !pixelmapArray) {
return ARKUI_ERROR_CODE_PARAM_INVALID;
}
auto* dragActions = reinterpret_cast<ArkUIDragAction*>(dragAction);