Commit c91d8aa1a51 for nodejs
commit c91d8aa1a51058f7eaf36b86e9f9ea2ac7e11277
Author: René <rene@renegade334.me.uk>
Date: Thu Nov 19 14:57:12 2026 +0000
fs: use try...finally for abort race
Signed-off-by: Renegade334 <rene@renegade334.me.uk>
PR-URL: https://github.com/nodejs/node/pull/67545
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
index 9696012b0c2..8507abcf023 100644
--- a/lib/internal/fs/promises.js
+++ b/lib/internal/fs/promises.js
@@ -112,6 +112,7 @@ const {
} = require('internal/util');
const { getOptionValue } = require('internal/options');
const EventEmitter = require('events');
+const { addAbortListener } = require('internal/events/abort_listener');
const { StringDecoder } = require('string_decoder');
const { kFSWatchStart, watch } = require('internal/fs/watchers');
const nonNativeWatcher = require('internal/fs/recursive_watch');
@@ -1225,10 +1226,12 @@ function raceWithSignal(opPromise, signal) {
async function raceWithAbortSignal(opPromise, signal) {
const { promise: abortPromise, reject } = PromiseWithResolvers();
- // eslint-disable-next-line no-unused-vars
- using _ = EventEmitter.addAbortListener(signal,
- rejectWithReason(signal, reject));
- return await SafePromiseRace([opPromise, abortPromise]);
+ const listener = addAbortListener(signal, rejectWithReason(signal, reject));
+ try {
+ return await SafePromiseRace([opPromise, abortPromise]);
+ } finally {
+ listener[SymbolDispose]();
+ }
}
async function writeFileHandle(filehandle, data, signal, encoding) {