stream: Never call decoder.end() multiple times

Updated version that does what it says without assigning state.decoder.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index b09694c071..ad0a783985 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -342,14 +342,14 @@ function chunkInvalid(state, chunk) {
 
 
 function onEofChunk(stream, state) {
-  state.ended = true;
-  if (state.decoder) {
+  if (state.decoder && !state.ended) {
     var chunk = state.decoder.end();
     if (chunk && chunk.length) {
       state.buffer.push(chunk);
       state.length += state.objectMode ? 1 : chunk.length;
     }
   }
+  state.ended = true;
 
   // if we've ended and we have some data left, then emit
   // 'readable' now to make sure it gets picked up.
@@ -733,12 +733,12 @@ Readable.prototype.wrap = function(stream) {
 
   var self = this;
   stream.on('end', function() {
-    state.ended = true;
-    if (state.decoder) {
+    if (state.decoder && !state.ended) {
       var chunk = state.decoder.end();
       if (chunk && chunk.length)
         self.push(chunk);
     }
+    state.ended = true;
 
     self.push(null);
   });