lib: make WeakRef safe in abort_controller

jazelly · targos · commit d86f24787b4f · 2024-10-02T16:04:17.000+02:00
PR-URL: #54791 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -11,9 +11,9 @@ const {
 PromiseResolve,
 SafeFinalizationRegistry,
 SafeSet,
+ SafeWeakRef,
 Symbol,
 SymbolToStringTag,
- WeakRef,
 } = primordials;
 
 const {
@@ -188,7 +188,7 @@ class AbortSignal extends EventTarget {
 signal[kTimeout] = true;
 clearTimeoutRegistry.register(
 signal,
- setWeakAbortSignalTimeout(new WeakRef(signal), delay));
+ setWeakAbortSignalTimeout(new SafeWeakRef(signal), delay));
 return signal;
 }
 
@@ -202,7 +202,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];
@@ -212,7 +212,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;

-Original file line number
+Diff line change
  PromiseResolve,
  SafeFinalizationRegistry,
  SafeSet,
 + SafeWeakRef,
  Symbol,
  SymbolToStringTag,
 - WeakRef,
 }=primordials;
 const{
 signal[kTimeout]=true;
 clearTimeoutRegistry.register(
 signal,
 -setWeakAbortSignalTimeout(newWeakRef(signal),delay));
 +setWeakAbortSignalTimeout(newSafeWeakRef(signal),delay));
 returnsignal;
+}
 if(!signals.length){
 returnresultSignal;
+}
 -constresultSignalWeakRef=newWeakRef(resultSignal);
 +constresultSignalWeakRef=newSafeWeakRef(resultSignal);
 resultSignal[kSourceSignals]=newSafeSet();
 for(leti=0;i<signals.length;i++){
 constsignal=signals[i];
+}
 signal[kDependantSignals]??=newSafeSet();
 if(!signal[kComposite]){
 -resultSignal[kSourceSignals].add(newWeakRef(signal));
 +resultSignal[kSourceSignals].add(newSafeWeakRef(signal));
 signal[kDependantSignals].add(resultSignalWeakRef);
 }elseif(!signal[kSourceSignals]){
 continue;