From 2a2f9f7598b3c706d5e200018296a0f1d0315c83 Mon Sep 17 00:00:00 2001
From: jedel1043 <jedel0124@gmail.com>
Date: Fri, 20 Jan 2023 13:55:29 -0600
Subject: [PATCH] Fix memory leaks

---
 boa_gc/src/internals/ephemeron_box.rs | 10 ++++++++++
 boa_gc/src/lib.rs                     | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/boa_gc/src/internals/ephemeron_box.rs b/boa_gc/src/internals/ephemeron_box.rs
index 9c220e1b066..68cbb0af976 100644
--- a/boa_gc/src/internals/ephemeron_box.rs
+++ b/boa_gc/src/internals/ephemeron_box.rs
@@ -88,6 +88,16 @@ pub(crate) struct EphemeronBox<K: Trace + ?Sized + 'static, V: Trace + 'static>
     data: Cell<Option<NonNull<Data<K, V>>>>,
 }
 
+impl<K: Trace + ?Sized + 'static, V: Trace + 'static> Drop for EphemeronBox<K, V> {
+    fn drop(&mut self) {
+        if let Some(data) = self.data.take() {
+            // SAFETY: `data` comes from an `into_raw` call, so this pointer is safe to pass to
+            // `from_raw`.
+            drop(unsafe { Box::from_raw(data.as_ptr()) });
+        }
+    }
+}
+
 struct Data<K: Trace + ?Sized + 'static, V: Trace + 'static> {
     key: NonNull<GcBox<K>>,
     value: V,
diff --git a/boa_gc/src/lib.rs b/boa_gc/src/lib.rs
index 87a0b9267bb..49158b19369 100644
--- a/boa_gc/src/lib.rs
+++ b/boa_gc/src/lib.rs
@@ -451,13 +451,22 @@ impl Collector {
         // Not initializing a dropguard since this should only be invoked when BOA_GC is being dropped.
         let _guard = DropGuard::new();
 
-        let sweep_head = &gc.strong_start;
-        while let Some(node) = sweep_head.get() {
+        let strong_head = &gc.strong_start;
+        while let Some(node) = strong_head.get() {
             // SAFETY:
             // The `Allocator` must always ensure its start node is a valid, non-null pointer that
             // was allocated by `Box::from_raw(Box::new(..))`.
             let unmarked_node = unsafe { Box::from_raw(node.as_ptr()) };
-            sweep_head.set(unmarked_node.header.next.take());
+            strong_head.set(unmarked_node.header.next.take());
+        }
+
+        let eph_head = &gc.weak_start;
+        while let Some(node) = eph_head.get() {
+            // SAFETY:
+            // The `Allocator` must always ensure its start node is a valid, non-null pointer that
+            // was allocated by `Box::from_raw(Box::new(..))`.
+            let unmarked_node = unsafe { Box::from_raw(node.as_ptr()) };
+            eph_head.set(unmarked_node.header().next.take());
         }
     }
 }