From 15b3d5b6f241f89ead5bd865ccaace827c8be747 Mon Sep 17 00:00:00 2001
From: zxb063 <hz.zhangxiaobo@huawei.com>
Date: Tue, 10 Nov 2020 10:17:40 +0800
Subject: [PATCH] fix if-type list-item memory leack

---
 .../component/list/list-item/item9/item9.hml  | 34 +++++++++++++++++--
 src/core/components/list_adapter.cpp          | 10 ++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml b/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml
index d4bcd945..7492ce4d 100755
--- a/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml
+++ b/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.hml
@@ -35,10 +35,40 @@ limitations under the License.
     "
   >
     <list-item if="{{ status }}" style="width: 280px; height: 50px">
-      <text class="text"> item-if </text>
+      <text class="text"> item-if0 </text>
+    </list-item>
+    <list-item if="{{ status }}" style="width: 280px; height: 50px">
+      <text class="text"> item-if1 </text>
+    </list-item>
+    <list-item if="{{ status }}" style="width: 280px; height: 50px">
+      <text class="text"> item-if2 </text>
+    </list-item>
+    <list-item if="{{ status }}" style="width: 280px; height: 50px">
+      <text class="text"> item-if3 </text>
+    </list-item>
+    <list-item if="{{ status }}" style="width: 280px; height: 50px">
+      <text class="text"> item-if4 </text>
+    </list-item>
+    <list-item if="{{ status }}" style="width: 280px; height: 50px">
+      <text class="text"> item-if5 </text>
+    </list-item>
+    <list-item style="width: 280px; height: 50px">
+      <text class="text"> item-common0 </text>
+    </list-item>
+    <list-item style="width: 280px; height: 50px">
+      <text class="text"> item-common1 </text>
+    </list-item>
+    <list-item style="width: 280px; height: 50px">
+      <text class="text"> item-common2 </text>
+    </list-item>
+    <list-item style="width: 280px; height: 50px">
+      <text class="text"> item-common3 </text>
+    </list-item>
+    <list-item style="width: 280px; height: 50px">
+      <text class="text"> item-common4 </text>
     </list-item>
     <list-item style="width: 280px; height: 50px">
-      <text class="text"> item-common </text>
+      <text class="text"> item-common5 </text>
     </list-item>
   </list>
   <input
diff --git a/src/core/components/list_adapter.cpp b/src/core/components/list_adapter.cpp
index 26f09817..70af92ee 100755
--- a/src/core/components/list_adapter.cpp
+++ b/src/core/components/list_adapter.cpp
@@ -262,7 +262,10 @@ JSValue ListAdapter::GetElement(int16_t listItemsIndex, int16_t index, bool &isF
 
         // if it is a for+if type list-item, here will ignore if attribure
         if (DescriptorUtils::IsIfDescriptor(nativeElement)) {
-            element = DescriptorUtils::RenderIfDescriptor(nativeElement);
+            element = DescriptorUtils::GetDescriptorRendered(nativeElement);
+            if (IS_UNDEFINED(element)) {
+                element = DescriptorUtils::RenderIfDescriptor(nativeElement);
+            }
             ReleaseJerryValue(nativeElement, VA_ARG_END_FLAG);
             HILOG_ERROR(HILOG_MODULE_ACE, "List_adapter: list-item not support setting if and for attribute at once.");
         } else { // if it is a for type list-item
@@ -270,7 +273,10 @@ JSValue ListAdapter::GetElement(int16_t listItemsIndex, int16_t index, bool &isF
         }
         ReleaseJerryValue(item, itemIdx, renderPropValue, VA_ARG_END_FLAG);
     } else if (DescriptorUtils::IsIfDescriptor(descriptorOrElement)) { // if it is a if type list-item
-        element = DescriptorUtils::RenderIfDescriptor(descriptorOrElement);
+        element = DescriptorUtils::GetDescriptorRendered(descriptorOrElement);
+        if (IS_UNDEFINED(element)) {
+            element = DescriptorUtils::RenderIfDescriptor(descriptorOrElement);
+        }
     } else { // if it is a common list-item
         element = descriptorOrElement;
     }
-- 
Gitee