Fix for Prevent issue CID - 63598

Change-Id: Ia8312c2c5470aa57eb1972c92da6c1824fcf3458

diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp
index 67a35fa..c7812d5 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp
@@ -1017,7 +1017,7 @@ _IconListPresenter::UpdateList(void)
                for (int index = 0; index < itemCount; index++)
                {
                        _IconListItem* pItem = dynamic_cast <_IconListItem*>(__pItemProviderAdaptor->LoadItem(DEFAULT_GROUP_INDEX, index));
-                       if (pItem->GetItemAccessibilityElement() != null)
+                       if (pItem != null && pItem->GetItemAccessibilityElement() != null)
                        {
                                pItem->GetItemAccessibilityElement()->Activate(false);
                        }

diff --git a/src/ui/controls/FUiCtrl_OptionMenuItem.cpp b/src/ui/controls/FUiCtrl_OptionMenuItem.cpp
index 5bc7eca..0cd1d37 100755 (executable)
--- a/src/ui/controls/FUiCtrl_OptionMenuItem.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenuItem.cpp
@@ -630,17 +630,11 @@ _OptionMenuItem::DrawArrow(void)
 
        if (__selected == true)
        {
-               if (__pArrowPressedBitmap)
-               {
-                       __pArrowLabel->SetBackgroundBitmap(*__pArrowPressedBitmap);
-               }
+               __pArrowLabel->SetBackgroundBitmap(*__pArrowPressedBitmap);
        }
        else
        {
-               if (__pArrowBitmap)
-               {
-                       __pArrowLabel->SetBackgroundBitmap(*__pArrowBitmap);
-               }
+               __pArrowLabel->SetBackgroundBitmap(*__pArrowBitmap);
        }
 
        __pArrowLabel->Invalidate();