From f3279ee23d0917d0b21a763ea3397347f46b3f56 Mon Sep 17 00:00:00 2001 From: Jeahoon Kim Date: Tue, 2 Apr 2013 19:43:38 +0900 Subject: [PATCH] Fixed a segv defect. (LayoutTC) Change-Id: I4e09dab4c1b7ee6ca09b8702a568789e6e8a6d60 Signed-off-by: Jeahoon Kim --- src/ui/layout/FUi_LayoutLayoutContainer.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ui/layout/FUi_LayoutLayoutContainer.cpp b/src/ui/layout/FUi_LayoutLayoutContainer.cpp index 67f6aa5..2b89c3e 100755 --- a/src/ui/layout/FUi_LayoutLayoutContainer.cpp +++ b/src/ui/layout/FUi_LayoutLayoutContainer.cpp @@ -61,6 +61,7 @@ LayoutContainer::~LayoutContainer(void) pLayoutNode = __pLayoutList->GetNextNode(*pLayoutNode); } delete __pLayoutList; + __pLayoutList = null; } result @@ -377,17 +378,20 @@ LayoutContainer::LayoutExists(Layout& layout) void LayoutContainer::OnDestroyContainerProxy() { - LayoutListNode* pCurNode = __pLayoutList->GetFirstNode(); - Layout* pLayout = null; - - while (pCurNode) + if (__pLayoutList != null) { - pLayout = pCurNode->GetLayout(); - if (pLayout) + LayoutListNode* pCurNode = __pLayoutList->GetFirstNode(); + Layout* pLayout = null; + + while (pCurNode) { - pLayout->SetContainer(this); + pLayout = pCurNode->GetLayout(); + if (pLayout) + { + pLayout->SetContainer(this); + } + pCurNode = __pLayoutList->GetNextNode(*pCurNode); } - pCurNode = __pLayoutList->GetNextNode(*pCurNode); } } @@ -397,5 +401,4 @@ LayoutContainer::GetLayoutList(void) return __pLayoutList; } - }}} // Tizen::Ui::_Layout -- 2.7.4