From 0a0b39ec979075cb95b5320443632ed5de8ffbc2 Mon Sep 17 00:00:00 2001 From: bizhenhang Date: Thu, 24 Apr 2025 19:16:54 +0800 Subject: [PATCH] add crash log Signed-off-by: bizhenhang --- .../pattern/grid_row/grid_row_layout_algorithm.cpp | 2 +- .../core/components_v2/grid_layout/grid_container_utils.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_algorithm.cpp b/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_algorithm.cpp index 3aed9790891..d3d0aede3eb 100644 --- a/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_algorithm.cpp +++ b/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_algorithm.cpp @@ -271,7 +271,7 @@ bool GridRowLayoutAlgorithm::GetSizeTypeAndMaxSize(LayoutWrapper* layoutWrapper, CHECK_NULL_RETURN(windowManager, false); auto mode = windowManager->GetWindowMode(); sizeType = GridContainerUtils::ProcessGridSizeType(layoutProperty->GetBreakPointsValue(), - Size(maxSize.Width(), maxSize.Height()), mode, PipelineBase::GetCurrentContext()); + Size(maxSize.Width(), maxSize.Height()), mode, PipelineBase::GetCurrentContextSafelyWithCheck()); return true; } diff --git a/frameworks/core/components_v2/grid_layout/grid_container_utils.cpp b/frameworks/core/components_v2/grid_layout/grid_container_utils.cpp index 7514cb76355..1ffe03e611b 100644 --- a/frameworks/core/components_v2/grid_layout/grid_container_utils.cpp +++ b/frameworks/core/components_v2/grid_layout/grid_container_utils.cpp @@ -48,7 +48,10 @@ GridSizeType GridContainerUtils::ProcessGridSizeType(const V2::BreakPoints& brea auto threshold = ParseBreakpoints(breakpoints); double windowWidth = 0.0; if (breakpoints.reference == BreakPointsReference::WindowSize) { - CHECK_NULL_RETURN(pipeline, GridSizeType::UNDEFINED); + if (!pipeline) { + TAG_LOGI(AceLogTag::ACE_GRIDROW, "pipeline is null"); + return GridSizeType::UNDEFINED; + } windowWidth = pipeline->GetDisplayWindowRectInfo().GetSize().Width(); if (mode == WindowMode::WINDOW_MODE_FLOATING && Container::LessThanAPITargetVersion(PlatformVersion::VERSION_TWENTY)) { -- Gitee