openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-12-03 13:06:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!48707 【AlphabetIndexer】容器数据读取前添加判空防止越界读情况发生

Browse Source 
Merge pull request !48707 from zhangDH/Refresh
This commit is contained in:
openharmony_ci 2024-11-16 13:53:39 +00:00 committed by Gitee
commit 04443b2032
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frameworks/core/components_ng/pattern/indexer/indexer_pattern.cpp
View File

@ -159,6 +159,9 @@ void IndexerPattern::InitTouchEvent(const RefPtr<GestureEventHub>& gestureHub)
auto touchCallback = [weak = WeakClaim(this)](const TouchEventInfo& info) { auto touchCallback = [weak = WeakClaim(this)](const TouchEventInfo& info) {
auto indexerPattern = weak.Upgrade(); auto indexerPattern = weak.Upgrade();
CHECK_NULL_VOID(indexerPattern); CHECK_NULL_VOID(indexerPattern);
if (info.GetTouches().empty()) {
return;
}
TouchType touchType = info.GetTouches().front().GetTouchType(); TouchType touchType = info.GetTouches().front().GetTouchType();
if (touchType == TouchType::DOWN) { if (touchType == TouchType::DOWN) {
indexerPattern->isTouch_ = true; indexerPattern->isTouch_ = true;
@ -513,7 +516,7 @@ void IndexerPattern::InitPopupPanEvent()
void IndexerPattern::OnTouchDown(const TouchEventInfo& info) void IndexerPattern::OnTouchDown(const TouchEventInfo& info)
{ {
TAG_LOGI(AceLogTag::ACE_ALPHABET_INDEXER, "touch down at alphabetIndexer"); TAG_LOGI(AceLogTag::ACE_ALPHABET_INDEXER, "touch down at alphabetIndexer");
if (itemCount_ <= 0) { if (itemCount_ <= 0 || info.GetTouches().empty()) {
return; return;
} }
MoveIndexByOffset(info.GetTouches().front().GetLocalLocation()); MoveIndexByOffset(info.GetTouches().front().GetLocalLocation());
@ -1601,6 +1604,9 @@ void IndexerPattern::AddPopupTouchListener(RefPtr<FrameNode> popupNode)
auto indexerPattern = weak.Upgrade(); auto indexerPattern = weak.Upgrade();
CHECK_NULL_VOID(indexerPattern); CHECK_NULL_VOID(indexerPattern);
info.SetStopPropagation(true); info.SetStopPropagation(true);
if (info.GetTouches().empty()) {
return;
}
auto touchType = info.GetTouches().front().GetTouchType(); auto touchType = info.GetTouches().front().GetTouchType();
if (touchType == TouchType::DOWN) { if (touchType == TouchType::DOWN) {
indexerPattern->isTouch_ = true; indexerPattern->isTouch_ = true;
@ -1623,6 +1629,9 @@ void IndexerPattern::AddListItemClickListener(RefPtr<FrameNode>& listItemNode, i
auto touchCallback = [weak = WeakClaim(this), index](const TouchEventInfo& info) { auto touchCallback = [weak = WeakClaim(this), index](const TouchEventInfo& info) {
auto indexerPattern = weak.Upgrade(); auto indexerPattern = weak.Upgrade();
CHECK_NULL_VOID(indexerPattern); CHECK_NULL_VOID(indexerPattern);
if (info.GetTouches().empty()) {
return;
}
TouchType touchType = info.GetTouches().front().GetTouchType(); TouchType touchType = info.GetTouches().front().GetTouchType();
if (touchType == TouchType::DOWN) { if (touchType == TouchType::DOWN) {
indexerPattern->OnListItemClick(index); indexerPattern->OnListItemClick(index);