From 6b8309d9a78b02354d563efc65a272772e101046 Mon Sep 17 00:00:00 2001
From: zbx <zhangboxiao1@huawei.com>
Date: Wed, 3 Sep 2025 09:54:47 +0800
Subject: [PATCH] Fix EcmaGlobalStorage Memory Leak

Issue: ICW39K

Signed-off-by: zbx <zhangboxiao1@huawei.com>
Change-Id: I1a67fb5d87679be42f74d406d5caef2ae8b40326
---
 ecmascript/ecma_global_storage.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ecmascript/ecma_global_storage.h b/ecmascript/ecma_global_storage.h
index 38e841c81f..2bab31e84f 100644
--- a/ecmascript/ecma_global_storage.h
+++ b/ecmascript/ecma_global_storage.h
@@ -422,13 +422,13 @@ public:
             node->SetObject(JSTaggedValue::Undefined().GetRawData());
         };
 
-        IterateNodeList<decltype(clearWeakNodeCallback), WeakNode>(clearWeakNodeCallback, topWeakGlobalNodes_);
-        IterateNodeList<decltype(clearNodeCallback), T>(clearNodeCallback, topXRefGlobalNodes_);
-        IterateNodeList<decltype(clearNodeCallback), T>(clearNodeCallback, topGlobalNodes_);
+        IterateNodeList<decltype(clearWeakNodeCallback), WeakNode>(clearWeakNodeCallback, topWeakGlobalNodes_, true);
+        IterateNodeList<decltype(clearNodeCallback), T>(clearNodeCallback, topXRefGlobalNodes_, true);
+        IterateNodeList<decltype(clearNodeCallback), T>(clearNodeCallback, topGlobalNodes_, true);
     }
 
     template<class Callback, class S>
-    inline void IterateNodeList(Callback callback, NodeList<S> *nodeList)
+    inline void IterateNodeList(Callback callback, NodeList<S> *nodeList, bool releaseNodeList)
     {
         auto *next = nodeList;
         NodeList<S> *current = nullptr;
@@ -437,6 +437,9 @@ public:
             next = current->GetNext();
             ASSERT(current != next);
             current->IterateUsageGlobal(callback);
+            if (releaseNodeList) {
+                allocator_->Delete(current);
+            }
         }
     }
 
@@ -500,17 +503,17 @@ public:
     template<class Callback>
     void IterateUsageGlobal(Callback &&callback)
     {
-        IterateNodeList<Callback, T>(callback, topGlobalNodes_);
+        IterateNodeList<Callback, T>(callback, topGlobalNodes_, false);
         if (nodeKind_ == NodeKind::UNIFIED_NODE) {
             return;
         }
-        IterateNodeList<Callback, T>(callback, topXRefGlobalNodes_);
+        IterateNodeList<Callback, T>(callback, topXRefGlobalNodes_, false);
     }
 
     template<class Callback>
     void IterateWeakUsageGlobal(Callback callback)
     {
-        IterateNodeList<Callback, WeakNode>(callback, topWeakGlobalNodes_);
+        IterateNodeList<Callback, WeakNode>(callback, topWeakGlobalNodes_, false);
     }
 
     ECMAGLOBALSTORAGE_PUBLIC_HYBRID_EXTENSION()
-- 
Gitee