Prevent issues are fixed.

Change-Id: I9748bc84af85676d6a75fef4e2c09f4889bbc9b1
Signed-off-by: “Bumseung <bumseung.cho@samsung.com>

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index cc428fb..ecb2933 100755 (executable)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -1341,48 +1341,50 @@ _AccessibilityManager::MakeList(void)
                                        }
                                }
                        }
-                       controlList.RemoveAll();
-                       controlList.Add(pControl);
-                       DownVisitor(*pControl, controlList);
-                       int _count = controlList.GetCount();
-                       LinkedListT<_AccessibilityElement*> _elementPositionList;
-                       for (int i = 0; i < _count ; i++)
+                       if (pControl)
                        {
-                               if (controlList.GetAt(i, pControl) == E_SUCCESS)
+                               controlList.RemoveAll();
+                               controlList.Add(pControl);
+                               DownVisitor(*pControl, controlList);
+                               int _count = controlList.GetCount();
+                               LinkedListT<_AccessibilityElement*> _elementPositionList;
+                               for (int i = 0; i < _count ; i++)
+                               {
+                                       if (controlList.GetAt(i, pControl) == E_SUCCESS)
+                                       {
+                                               pContainer = pControl->GetAccessibilityContainer();
+                                               if (pContainer == null)
+                                               {
+                                                       continue;
+                                               }
+                                               if (IsContainerValid(pContainer))
+                                               {
+                                                       pContainer->GetElements(_elementPositionList);
+                                               }
+                                       }
+                               }
+                               _elementPositionList.Sort(comparer);
+                               _count = _elementPositionList.GetCount();
+                               _AccessibilityElement* pElement = null;
+                               for (int i = 0 ; i < _count ; i++)
                                {
-                                       pContainer = pControl->GetAccessibilityContainer();
-                                       if (pContainer == null)
+                                       r = _elementPositionList.GetAt(i, pElement);
+                                       if (r != E_SUCCESS)
                                        {
                                                continue;
                                        }
-                                       if (IsContainerValid(pContainer))
+                                       if (__candidateList.Contains(pElement))
                                        {
-                                               pContainer->GetElements(_elementPositionList);
+                                               continue;
                                        }
+                                       __candidateList.Add(pElement);
+                                       elementPositionByControlList.Remove(pElement);
+                                       elementPositionByControlList.InsertAt(pElement, index);
+                                       elementPositionList.Remove(pElement);
+                                       elementPositionList.InsertAt(pElement, index);
+                                       index++;
                                }
                        }
-                       _elementPositionList.Sort(comparer);
-                       _count = _elementPositionList.GetCount();
-                       _AccessibilityElement* pElement = null;
-                       for (int i = 0 ; i < _count ; i++)
-                       {
-                               r = _elementPositionList.GetAt(i, pElement);
-                               if (r != E_SUCCESS)
-                               {
-                                       continue;
-                               }
-                               if (__candidateList.Contains(pElement))
-                               {
-                                       continue;
-                               }
-                               __candidateList.Add(pElement);
-                               elementPositionByControlList.Remove(pElement);
-                               elementPositionByControlList.InsertAt(pElement, index);
-                               elementPositionList.Remove(pElement);
-                               elementPositionList.InsertAt(pElement, index);
-                               index++;
-
-                       }
                }
                else
                {
@@ -1623,7 +1625,6 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        
                        ReadElement(*pElement);
                }
-               delete pListenerList;
                return true;
        }
        return false;

diff --git a/src/ui/FUi_AccessibilityTtsPlayer.cpp b/src/ui/FUi_AccessibilityTtsPlayer.cpp
index f41f254..1167e3b 100644 (file)
--- a/src/ui/FUi_AccessibilityTtsPlayer.cpp
+++ b/src/ui/FUi_AccessibilityTtsPlayer.cpp
@@ -149,33 +149,37 @@ _AccessibilityTtsPlayer::GetCurrentLocale(void)
        if (__pTts)
        {
                const LinkedList* pList = static_cast<const LinkedList*>(__pTts->GetSupportedLocales());
-               int count = pList->GetCount();
-               if(pList == null || count < 1)
+               if (pList && pList->GetCount() > 0)
                {
-                       delete __pTts;
-                       __pTts = null;
-                       SysLog(NID_UI, "System error was occured.");
-               }
+                       int count = pList->GetCount();
 
-               bool supportedLanguage = false;
-               for (int i = 0 ; i < count ; i++)
-               {
-                       const Locale* pTempLocale = static_cast<const Locale*>(pList->GetAt(i));
-                       String tempLocaleCode = L"";
-                       tempLocaleCode.Append(pTempLocale->GetLanguageCodeString());
-                       tempLocaleCode.Append(L"_");
-                       tempLocaleCode.Append(pTempLocale->GetCountryCodeString());
-                       if (tempLocaleCode == __localeString)
+                       bool supportedLanguage = false;
+                       for (int i = 0 ; i < count ; i++)
                        {
-                               locale = *pTempLocale;
-                               supportedLanguage = true;
-                               break;
+                               const Locale* pTempLocale = static_cast<const Locale*>(pList->GetAt(i));
+                               String tempLocaleCode = L"";
+                               tempLocaleCode.Append(pTempLocale->GetLanguageCodeString());
+                               tempLocaleCode.Append(L"_");
+                               tempLocaleCode.Append(pTempLocale->GetCountryCodeString());
+                               if (tempLocaleCode == __localeString)
+                               {
+                                       locale = *pTempLocale;
+                                       supportedLanguage = true;
+                                       break;
+                               }
+                       }
+                       if(!supportedLanguage)
+                       {
+                               locale = Locale(Tizen::Locales::LANGUAGE_ENG,Tizen::Locales::COUNTRY_US);
                        }
                }
-               if(!supportedLanguage)
+               else
                {
-                       locale = Locale(Tizen::Locales::LANGUAGE_ENG,Tizen::Locales::COUNTRY_US);
+                       delete __pTts;
+                       __pTts = null;
+                       SysLog(NID_UI, "System error was occured.");
                }
+
        }
        return locale;
 }

diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp
index ccd404c..697dbf4 100755 (executable)
--- a/src/ui/FUi_ResourceManager.cpp
+++ b/src/ui/FUi_ResourceManager.cpp
@@ -859,6 +859,7 @@ _ResourceManager::GetAnimationN(int animationId, ArrayList*& pList)
                r = GetBitmapInternalN(frame.__fileName, BITMAP_PIXEL_FORMAT_ARGB8888, _CONTROL_ORIENTATION_PORTRAIT, pBitmap);
                SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM,"System error is occured.");
                pFrame = new (std::nothrow) AnimationFrame(*pBitmap, frame.__duration);
+               SysTryCatch(NID_UI, pFrame, , E_SYSTEM,"System error is occured.");
                pList->Add(pFrame);
                delete pBitmap;
        }