lib: make WeakRef safe in abort_controller

nodejs · Sep 5, 2024 · dd41480 · dd41480
1 parent dc74f17
commit dd41480
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -10,9 +10,9 @@ const {
   PromiseResolve,
   SafeFinalizationRegistry,
   SafeSet,
+  SafeWeakRef,
   Symbol,
   SymbolToStringTag,
-  WeakRef,
 } = primordials;
 
 const {
@@ -216,7 +216,7 @@ class AbortSignal extends EventTarget {
     signal[kTimeout] = true;
     clearTimeoutRegistry.register(
       signal,
-      setWeakAbortSignalTimeout(new WeakRef(signal), delay));
+      setWeakAbortSignalTimeout(new SafeWeakRef(signal), delay));
     return signal;
   }
 
@@ -230,7 +230,7 @@ class AbortSignal extends EventTarget {
     if (!signals.length) {
       return resultSignal;
     }
-    const resultSignalWeakRef = new WeakRef(resultSignal);
+    const resultSignalWeakRef = new SafeWeakRef(resultSignal);
     resultSignal[kSourceSignals] = new SafeSet();
     for (let i = 0; i < signals.length; i++) {
       const signal = signals[i];
@@ -240,7 +240,7 @@ class AbortSignal extends EventTarget {
       }
       signal[kDependantSignals] ??= new SafeSet();
       if (!signal[kComposite]) {
-        resultSignal[kSourceSignals].add(new WeakRef(signal));
+        resultSignal[kSourceSignals].add(new SafeWeakRef(signal));
         signal[kDependantSignals].add(resultSignalWeakRef);
       } else if (!signal[kSourceSignals]) {
         continue;