Fix listener leak in stream.pipe()

1 files changed, 30 insertions, 12 deletions

diff --git a/lib/stream.js b/lib/stream.js
index 94368d6c60..d31a9fe239 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -58,13 +58,6 @@ Stream.prototype.pipe = function(dest, options) {
     source.on('end', onend);
   }
 
-  dest.on('close', function() {
-    source.removeListener('data', ondata);
-    dest.removeListener('drain', ondrain);
-    source.removeListener('end', onend);
-  });
-
-
   /*
    * Questionable:
    */
@@ -80,14 +73,39 @@ Stream.prototype.pipe = function(dest, options) {
       source.emit('resume');
     };
   }
-
-  dest.on('pause', function() {
+  
+  var onpause = function() {
     source.pause();
-  });
+  }
 
-  dest.on('resume', function() {
+  dest.on('pause', onpause);
+  
+  var onresume = function() {
     if (source.readable) source.resume();
-  });
+  };
+  
+  dest.on('resume', onresume);
+  
+  var cleanup = function () {
+    source.removeListener('data', ondata);
+    dest.removeListener('drain', ondrain);
+    source.removeListener('end', onend);
+    
+    dest.removeListener('pause', onpause);
+    dest.removeListener('resume', onresume);
+    
+    source.removeListener('end', cleanup);
+    source.removeListener('close', cleanup);
+    
+    dest.removeListener('end', cleanup);
+    dest.removeListener('close', cleanup);
+  }
+  
+  source.on('end', cleanup);
+  source.on('close', cleanup);
+
+  dest.on('end', cleanup);
+  dest.on('close', cleanup);
 
   dest.emit('pipe', source);
 };