Fix nullptr for the text geometry.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-geometry.cpp

diff --git a/dali-toolkit/internal/text/text-geometry.cpp b/dali-toolkit/internal/text/text-geometry.cpp
index 6c90665..6f173cb 100644 (file)
--- a/dali-toolkit/internal/text/text-geometry.cpp
+++ b/dali-toolkit/internal/text/text-geometry.cpp
@@ -68,14 +68,29 @@ void GetTextGeometry(ModelPtr textModel, CharacterIndex startIndex, CharacterInd
   const CharacterIndex* const     glyphToCharacterBuffer         = visualModel->mGlyphsToCharacters.Begin();
   const CharacterDirection* const modelCharacterDirectionsBuffer = (0u != logicalModel->mCharacterDirections.Count()) ? logicalModel->mCharacterDirections.Begin() : NULL;
 
+  //Clear the lists
+  sizesList.Clear();
+  positionsList.Clear();
+
+  if(charactersToGlyphBuffer == nullptr || glyphsPerCharacterBuffer  == nullptr || charactersPerGlyphBuffer  == nullptr || glyphToCharacterBuffer == nullptr )
+  {
+    return;
+  }
+
   if(startIndex >= logicalModel->mText.Count() && endIndex >= logicalModel->mText.Count())
+  {
     return;
+  }
 
   if(startIndex >= logicalModel->mText.Count())
+  {
     startIndex = logicalModel->mText.Count() - 1;
+  }
 
   if(endIndex >= logicalModel->mText.Count())
+  {
     endIndex = logicalModel->mText.Count() - 1;
+  }
 
   if(startIndex > endIndex)
   {