Skip to content

Commit fee02c7

Browse files
jazellyjasnell
authored andcommitted
lib: make WeakRef safe in abort_controller
PR-URL: #54791 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent d38dc99 commit fee02c7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/internal/abort_controller.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ const {
1010
PromiseResolve,
1111
SafeFinalizationRegistry,
1212
SafeSet,
13+
SafeWeakRef,
1314
Symbol,
1415
SymbolToStringTag,
15-
WeakRef,
1616
} = primordials;
1717

1818
const {
@@ -220,7 +220,7 @@ class AbortSignal extends EventTarget {
220220
signal[kTimeout] = true;
221221
clearTimeoutRegistry.register(
222222
signal,
223-
setWeakAbortSignalTimeout(new WeakRef(signal), delay));
223+
setWeakAbortSignalTimeout(new SafeWeakRef(signal), delay));
224224
return signal;
225225
}
226226

@@ -238,7 +238,7 @@ class AbortSignal extends EventTarget {
238238
if (!signalsArray.length) {
239239
return resultSignal;
240240
}
241-
const resultSignalWeakRef = new WeakRef(resultSignal);
241+
const resultSignalWeakRef = new SafeWeakRef(resultSignal);
242242
resultSignal[kSourceSignals] = new SafeSet();
243243
for (let i = 0; i < signalsArray.length; i++) {
244244
const signal = signalsArray[i];
@@ -248,7 +248,7 @@ class AbortSignal extends EventTarget {
248248
}
249249
signal[kDependantSignals] ??= new SafeSet();
250250
if (!signal[kComposite]) {
251-
resultSignal[kSourceSignals].add(new WeakRef(signal));
251+
resultSignal[kSourceSignals].add(new SafeWeakRef(signal));
252252
signal[kDependantSignals].add(resultSignalWeakRef);
253253
} else if (!signal[kSourceSignals]) {
254254
continue;

0 commit comments

Comments
 (0)