fix memory leak

Change-Id: I187dbc338b12dfca365b91088b3b4f0ca86dadb1
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
apply code review

Change-Id: I07be3faddd4c8b79e75af23db1d80b922b59d7a1
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>

diff --git a/src/ui/FUi_UiBuilder.cpp b/src/ui/FUi_UiBuilder.cpp
index 7c79eee..d52ff0a 100644 (file)
--- a/src/ui/FUi_UiBuilder.cpp
+++ b/src/ui/FUi_UiBuilder.cpp
@@ -62,7 +62,10 @@ _UiBuilder::~_UiBuilder(void)
                for (int i = 0; i < controlCount; i++)
                {
                        __pUiBuilderControlList->GetAt(i, pUiBuilderControl);
-                       delete pUiBuilderControl;
+                       if (pUiBuilderControl)
+                       {
+                               delete pUiBuilderControl;
+                       }
                }
                __pUiBuilderControlList->RemoveAll();
                delete __pUiBuilderControlList;
@@ -344,17 +347,9 @@ _UiBuilder::Parse(void)
                {
                        r = MakeUI(pUiBuilderControl);
                        SysTryCatch(NID_UI, r == E_SUCCESS, , r, "[UiBuilder] Failed to create control %ls", pUiBuilderControl->GetType().GetPointer());
-                       delete pUiBuilderControl;
                }
        }
 
-       if (__pUiBuilderControlList)
-       {
-               __pUiBuilderControlList->RemoveAll();
-               delete __pUiBuilderControlList;
-               __pUiBuilderControlList = null;
-       }
-
        if (__pTransform)
        {
                delete __pTransform;