From 15682fd6a6e0c0987f37d27e53dec1e4192143cb Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 29 Mar 2022 09:13:57 +0900 Subject: [PATCH] text: Fix checking NULL after dereferencing This was detected by static analysis tool. Change-Id: I4a4566b5537e905c61cc16e38e54fe7d15fdae17 --- dali-toolkit/internal/text/text-view.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/text/text-view.cpp b/dali-toolkit/internal/text/text-view.cpp index 1ec978d..697dc04 100644 --- a/dali-toolkit/internal/text/text-view.cpp +++ b/dali-toolkit/internal/text/text-view.cpp @@ -114,11 +114,12 @@ Length View::GetGlyphs(GlyphInfo* glyphs, float calculatedAdvance = 0.f; const Character* textBuffer = mImpl->mLogicalModel->mText.Begin(); - // Get the character-spacing runs. - const Vector& characterSpacingGlyphRuns = mImpl->mVisualModel->GetCharacterSpacingGlyphRuns(); if(mImpl->mVisualModel) { + // Get the character-spacing runs. + const Vector& characterSpacingGlyphRuns = mImpl->mVisualModel->GetCharacterSpacingGlyphRuns(); + bool textElided = false; DevelText::EllipsisPosition::Type ellipsisPosition = GetEllipsisPosition(); -- 2.7.4