fixed prevent in font(Null pointer check)

Change-Id: I477ba45006cd591d549d1a7ffb49f5a5e8e41878
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>

diff --git a/src/graphics/FGrp_FontBidiUtil.cpp b/src/graphics/FGrp_FontBidiUtil.cpp
index 0033154..6411b4f 100644 (file)
--- a/src/graphics/FGrp_FontBidiUtil.cpp
+++ b/src/graphics/FGrp_FontBidiUtil.cpp
@@ -280,28 +280,28 @@ _GetBidiShapeString(BidiParagraph* pBidiProps)
 
                        pTestString = autoDeleteString.get();
                }
-       }
 
-       std::unique_ptr<FriBidiJoiningType[]> pJoinTypes(new (std::nothrow) FriBidiJoiningType[textLength]);
+               std::unique_ptr<FriBidiJoiningType[]> pJoinTypes(new (std::nothrow) FriBidiJoiningType[textLength]);
 
-       if (!pJoinTypes.get())
-       {
-               return pBidiProps->pString;
-       }
+               if (!pJoinTypes.get())
+               {
+                       return pBidiProps->pString;
+               }
 
-       fribidi_get_joining_types(pTestString, textLength, pJoinTypes.get());
+               fribidi_get_joining_types(pTestString, textLength, pJoinTypes.get());
 
-       fribidi_join_arabic(pBidiProps->pCharTypes, textLength, pBidiProps->pEmbeddingLevels, pJoinTypes.get());
+               fribidi_join_arabic(pBidiProps->pCharTypes, textLength, pBidiProps->pEmbeddingLevels, pJoinTypes.get());
 
-       fribidi_shape(FRIBIDI_FLAGS_DEFAULT | FRIBIDI_FLAGS_ARABIC, pBidiProps->pEmbeddingLevels, textLength, pJoinTypes.get(), pTestString);
+               fribidi_shape(FRIBIDI_FLAGS_DEFAULT | FRIBIDI_FLAGS_ARABIC, pBidiProps->pEmbeddingLevels, textLength, pJoinTypes.get(), pTestString);
 
-       if (sizeof(wchar_t) == sizeof(FriBidiChar))
-       {
-               pBidiProps->pString = (wchar_t *) pTestString;
-       }
-       else
-       {
-               _ConvertCharacterCode<wchar_t, FriBidiChar>(pBidiProps->pString, pTestString, textLength);
+               if (sizeof(wchar_t) == sizeof(FriBidiChar))
+               {
+                       pBidiProps->pString = (wchar_t *) pTestString;
+               }
+               else
+               {
+                       _ConvertCharacterCode<wchar_t, FriBidiChar>(pBidiProps->pString, pTestString, textLength);
+               }
        }
 
        return pBidiProps->pString;