From: suhyung Eom <suhyung.eom@samsung.com>
Date: Fri, 30 Dec 2016 06:27:35 +0000 (-0800)
Subject: Merge "[3.0] Fixed crash issue by referencing unallocated memory" into tizen_3.0
X-Git-Tag: accepted/tizen/3.0.m2/mobile/20170104.141503^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_3.0.m2_mobile;hp=8d7fbd05ef3f7600211c11c2df883e37e5cc937f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge "[3.0] Fixed crash issue by referencing unallocated memory" into tizen_3.0
---

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index ae9a68b..c803c1d 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -477,7 +477,7 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
     currentFontId = fontId;
 
     // Get the script for the current character.
-    const Script script = GetScript( index,
+    Script script = GetScript( index,
                                      scriptRunIt,
                                      scriptRunEndIt );
 
@@ -494,6 +494,10 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
                      description.path.c_str() );
     }
 #endif
+    if (script == TextAbstraction::UNKNOWN)
+    {
+      script = TextAbstraction::LATIN;
+    }
 
     // Validate whether the current character is supported by the given font.
     bool isValidFont = false;