fs: use finished over destroy w/ cb

destroy w/ is undocumented API which also will cause a race if the stream is already destroying and potentially invoking the callback too early and withou error. PR-URL: #32809 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Denys Otrishko <[email protected]>
nodejs · Apr 15, 2020 · a495a5e · a495a5e
1 parent 3f5142d
commit a495a5e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/internal/fs/streams.js b/lib/internal/fs/streams.js
@@ -23,7 +23,7 @@ const {
   copyObject,
   getOptions,
 } = require('internal/fs/utils');
-const { Readable, Writable } = require('stream');
+const { Readable, Writable, finished } = require('stream');
 const { toPathIfFileURL } = require('internal/url');
 const kIoDone = Symbol('kIoDone');
 const kIsPerformingIO = Symbol('kIsPerformingIO');
@@ -273,7 +273,8 @@ function closeFsStream(stream, cb, err) {
 }
 
 ReadStream.prototype.close = function(cb) {
-  this.destroy(null, cb);
+  if (typeof cb === 'function') finished(this, cb);
+  this.destroy();
 };
 
 ObjectDefineProperty(ReadStream.prototype, 'pending', {