From 021f107985bac8a333c72442baec1087a45ae655 Mon Sep 17 00:00:00 2001 From: killagu Date: Wed, 10 May 2023 19:55:11 +0800 Subject: [PATCH] fs: fix callback with error if SyncWriteStream writeSync failed Catch SyncWriteStream write file error. Fixes: https://github.com/nodejs/node/issues/47948 --- lib/internal/fs/sync_write_stream.js | 7 ++++++- test/parallel/test-internal-fs-syncwritestream.js | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/internal/fs/sync_write_stream.js b/lib/internal/fs/sync_write_stream.js index 8fa5c56aaffc62..863b11fffdcf6b 100644 --- a/lib/internal/fs/sync_write_stream.js +++ b/lib/internal/fs/sync_write_stream.js @@ -23,7 +23,12 @@ ObjectSetPrototypeOf(SyncWriteStream.prototype, Writable.prototype); ObjectSetPrototypeOf(SyncWriteStream, Writable); SyncWriteStream.prototype._write = function(chunk, encoding, cb) { - writeSync(this.fd, chunk, 0, chunk.length); + try { + writeSync(this.fd, chunk, 0, chunk.length); + } catch (e) { + cb(e); + return true; + } cb(); return true; }; diff --git a/test/parallel/test-internal-fs-syncwritestream.js b/test/parallel/test-internal-fs-syncwritestream.js index bafa5fd8f4624f..11a32682017e46 100644 --- a/test/parallel/test-internal-fs-syncwritestream.js +++ b/test/parallel/test-internal-fs-syncwritestream.js @@ -74,3 +74,15 @@ const filename = path.join(tmpdir.path, 'sync-write-stream.txt'); assert.strictEqual(stream.fd, null); })); } + +// Verify that an error on _write() triggers an 'error' event. +{ + const fd = fs.openSync(filename, 'w'); + const stream = new SyncWriteStream(fd); + + assert.strictEqual(stream.fd, fd); + stream._write({}, null, common.mustCall((err) => { + assert(err); + fs.closeSync(fd); + })); +}