Skip to content

Commit c91d8aa

Browse files
authored
fs: use try...finally for abort race
Signed-off-by: Renegade334 <rene@renegade334.me.uk> PR-URL: #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>
1 parent 029acbf commit c91d8aa

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

‎lib/internal/fs/promises.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
} = require('internal/util');
113113
const { getOptionValue } = require('internal/options');
114114
const EventEmitter = require('events');
115+
const { addAbortListener } = require('internal/events/abort_listener');
115116
const { StringDecoder } = require('string_decoder');
116117
const { kFSWatchStart, watch } = require('internal/fs/watchers');
117118
const nonNativeWatcher = require('internal/fs/recursive_watch');
@@ -1225,10 +1226,12 @@ function raceWithSignal(opPromise, signal) {
12251226

12261227
async function raceWithAbortSignal(opPromise, signal) {
12271228
const { promise: abortPromise, reject } = PromiseWithResolvers();
1228-
// eslint-disable-next-line no-unused-vars
1229-
using _ = EventEmitter.addAbortListener(signal,
1230-
rejectWithReason(signal, reject));
1231-
return await SafePromiseRace([opPromise, abortPromise]);
1229+
const listener = addAbortListener(signal, rejectWithReason(signal, reject));
1230+
try {
1231+
return await SafePromiseRace([opPromise, abortPromise]);
1232+
} finally {
1233+
listener[SymbolDispose]();
1234+
}
12321235
}
12331236

12341237
async function writeFileHandle(filehandle, data, signal, encoding) {

0 commit comments

Comments
 (0)