stream: simplify Readable push/unshift logic

PR-URL: #32899 Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Apr 30, 2020 · 0bd24a6 · 0bd24a6
1 parent 2496db8
commit 0bd24a6
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -233,13 +233,15 @@ function readableAddChunk(stream, chunk, encoding, addToFront) {
   if (!state.objectMode) {
     if (typeof chunk === 'string') {
       encoding = encoding || state.defaultEncoding;
-      if (addToFront && state.encoding && state.encoding !== encoding) {
-        // When unshifting, if state.encoding is set, we have to save
-        // the string in the BufferList with the state encoding.
-        chunk = Buffer.from(chunk, encoding).toString(state.encoding);
-      } else if (encoding !== state.encoding) {
-        chunk = Buffer.from(chunk, encoding);
-        encoding = '';
+      if (state.encoding !== encoding) {
+        if (addToFront && state.encoding) {
+          // When unshifting, if state.encoding is set, we have to save
+          // the string in the BufferList with the state encoding.
+          chunk = Buffer.from(chunk, encoding).toString(state.encoding);
+        } else {
+          chunk = Buffer.from(chunk, encoding);
+          encoding = '';
+        }
       }
     } else if (chunk instanceof Buffer) {
       encoding = '';