Fix for Prevent issues

Change-Id: I8d3d462e193bebbe105310d4632dc04f47f7de47

diff --git a/src/ui/controls/FUiCtrl_ContextMenu.cpp b/src/ui/controls/FUiCtrl_ContextMenu.cpp
index a052513..adb2f85 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenu.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenu.cpp
@@ -514,13 +514,15 @@ _ContextMenu::GetItemActionIdAt(int index) const
 {
        int count = __actionId.GetCount();
        int actionId = -1;
+       result r = E_SUCCESS;
 
        if (count <= 0 || index >= count)
        {
                return -1;
        }
 
-       __actionId.GetAt(index, actionId);
+       r = __actionId.GetAt(index, actionId);
+       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, actionId, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return actionId;
 }

diff --git a/src/ui/controls/FUiCtrl_ContextMenuModel.cpp b/src/ui/controls/FUiCtrl_ContextMenuModel.cpp
index be5b574..e4f2166 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuModel.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuModel.cpp
@@ -144,7 +144,10 @@ _ContextMenuModel::ResetAllItem(void)
        for(int index = 0; index < count; index++)
        {
                pItem = static_cast <_ContextMenuItem*>(__items.GetAt(index));
-               pItem->SetAndInvalidate(false);
+               if (pItem)
+               {
+                       pItem->SetAndInvalidate(false);
+               }
        }
 }
 

diff --git a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp
index af0bb6e..d835743 100644 (file)
--- a/src/ui/controls/FUiCtrl_FastScrollIndex.cpp
+++ b/src/ui/controls/FUiCtrl_FastScrollIndex.cpp
@@ -394,12 +394,11 @@ _FastScrollIndex::AddChildTextIndexArray(int childOrder, const wchar_t* pTextInd
                        _FastScrollIndex* pFormerIndex = null;
 
                        pChildIndexList = new (std::nothrow) ArrayList();
-                       SysTryCatch(NID_UI_CTRL, pChildIndexList, , E_OUT_OF_MEMORY, "Memory allocation failed.");
+                       SysTryCatchLabel(NID_UI_CTRL, pChildIndexList, , CATCH1, E_OUT_OF_MEMORY, "Memory allocation failed.");
                        k = 0;
 
                        pFormerIndex = GetChildIndex(GetChildCount(pFormerList) - 1, pFormerList);
-                       SysTryCatch(NID_UI_CTRL, pFormerIndex, , GetLastResult(),
-                                       "[%s] Failed to get the child index.", GetErrorMessage(GetLastResult()));
+                       SysTryCatchLabel(NID_UI_CTRL, pFormerIndex, , CATCH1, GetLastResult(), "[%s] Failed to get the child index.", GetErrorMessage(GetLastResult()));
                        pFormerIndex->SetNextIndexList(pChildIndexList);
                        continue;
                }
@@ -468,13 +467,13 @@ _FastScrollIndex::AddChildTextIndexArray(int childOrder, const wchar_t* pTextInd
        delete[] pTempChar;
        return E_SUCCESS;
 
+CATCH1:
+       delete pChildIndexList;
+       pChildIndexList = null;
+
 CATCH:
        delete indexText;
        indexText = null;
-       delete pChildIndexList;
-       pChildIndexList = null;
-       delete pFirstIndexList;
-       pFirstIndexList = null;
        delete[] pTempChar;
 
        return r;

diff --git a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
index bb3fcb0..5e930ca 100644 (file)
--- a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
@@ -2271,7 +2271,7 @@ _FastScrollPresenter::AddAccessibilityElement(const _AccessibilityContainer& con
        if (onAccessibility)
        {
                r = pIndexView->AddAccessibilityElement(control);
-               SysTryReturnResult(NID_UI_CTRL, r = E_SUCCESS, r, "Failed to Add accessibility element.");
+               SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to Add accessibility element.");
        }
        else
        {

diff --git a/src/ui/controls/FUiCtrl_IconListItem.cpp b/src/ui/controls/FUiCtrl_IconListItem.cpp
index 96479e2..5a34659 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListItem.cpp
+++ b/src/ui/controls/FUiCtrl_IconListItem.cpp
@@ -770,6 +770,7 @@ _IconListItem::DrawBorder(Tizen::Graphics::Canvas& canvas, bool isFocused)
                        Color focusUiColor = __pProperty->GetBorderColor(isFocused);
 
                        pShadowBitmap = Tizen::Graphics::_BitmapImpl::GetColorReplacedBitmapN(*pShadowBitmap, Color::GetColor(COLOR_ID_MAGENTA), focusUiColor);
+                       SysTryReturn(NID_UI_CTRL, pShadowBitmap != null, GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
                        if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pShadowBitmap))
                        {
@@ -780,8 +781,9 @@ _IconListItem::DrawBorder(Tizen::Graphics::Canvas& canvas, bool isFocused)
                                pCanvas->DrawBitmap(__pProperty->GetDropShadowBitmapBounds(), *pShadowBitmap);
                        }
                        __pFocusVE->SetShowState(true);
-                       delete pCanvas;
+                       delete pShadowBitmap;
                }
+               delete pCanvas;
        }
        else
        {

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index d67d6c2..c0248e5 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -1445,6 +1445,9 @@ _TokenEditPresenter::CalculateTokenPositionFromIndex(int startIndex, bool leftWa
                        if (findPrevTokenLoopFlag)
                        {
                                pPreviousToken = static_cast< _Token* >(__pTokenList->GetAt(index - 1));
+                               r = GetLastResult();
+                               SysTryReturnResult(NID_UI_CTRL, pPreviousToken != null, r, "Propagating.");
+
                                findPrevTokenLoopFlag = false;
                        }
 
@@ -4290,6 +4293,8 @@ _TokenEditPresenter::ScrollToFocusedTokenAccessibilityElement(const _Accessibili
        {
                _Token* pToken = null;
                pToken = static_cast< _Token* >(__pTokenList->GetAt(focusedTokenIndex));
+               r = GetLastResult();
+               SysTryReturnResult(NID_UI_CTRL, pToken != null, r, "Propagating.");
 
                focusedTokenRectangle = pToken->displayRect;
 
@@ -4438,6 +4443,8 @@ _TokenEditPresenter::ScrollToFocusedToken(void)
        {
                _Token* pToken = null;
                pToken = static_cast <_Token*>(__pTokenList->GetAt(__focusedTokenIndex));
+               r = GetLastResult();
+               SysTryReturnResult(NID_UI_CTRL, pToken != null, r, "Propagating.");
 
                focussedTokenRectangle = pToken->displayRect;