Skip to content

Commit b338f3d

Browse files
ronagUlisesGascon
authored andcommitted
stream: avoid getter for defaultEncoding
PR-URL: #50203 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 4a830c2 commit b338f3d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

lib/internal/streams/writable.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -445,16 +445,17 @@ function _write(stream, chunk, encoding, cb) {
445445

446446
if (typeof encoding === 'function') {
447447
cb = encoding;
448-
encoding = (state[kState] & kDefaultUTF8Encoding) !== 0 ? 'utf8' : state.defaultEncoding;
449-
} else {
450-
if (!encoding)
451-
encoding = (state[kState] & kDefaultUTF8Encoding) !== 0 ? 'utf8' : state.defaultEncoding;
452-
else if (encoding !== 'buffer' && !Buffer.isEncoding(encoding))
453-
throw new ERR_UNKNOWN_ENCODING(encoding);
454-
if (typeof cb !== 'function')
455-
cb = nop;
448+
encoding = null;
456449
}
457450

451+
if (!encoding)
452+
encoding = (state[kState] & kDefaultUTF8Encoding) !== 0 ? 'utf8' : state[kDefaultEncodingValue];
453+
else if (encoding !== 'buffer' && !Buffer.isEncoding(encoding))
454+
throw new ERR_UNKNOWN_ENCODING(encoding);
455+
456+
if (cb == null || typeof cb !== 'function')
457+
cb = nop;
458+
458459
if (chunk === null) {
459460
throw new ERR_STREAM_NULL_VALUES();
460461
} else if ((state[kState] & kObjectMode) === 0) {

0 commit comments

Comments
 (0)