events: fix checking max listeners with 1

Fixes #2490.
nodejs · Jan 9, 2012 · 22d7fe1 · 22d7fe1 · bnoordhuis · Jan 9, 2012
1 parent 9a79bb6
commit 22d7fe1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/lib/events.js b/lib/events.js
@@ -115,27 +115,29 @@ EventEmitter.prototype.addListener = function(type, listener) {
     // If we've already got an array, just append.
     this._events[type].push(listener);
 
-    // Check for listener leak
-    if (!this._events[type].warned) {
-      var m;
-      if (this._maxListeners !== undefined) {
-        m = this._maxListeners;
-      } else {
-        m = defaultMaxListeners;
-      }
-
-      if (m && m > 0 && this._events[type].length > m) {
-        this._events[type].warned = true;
-        console.error('(node) warning: possible EventEmitter memory ' +
-                      'leak detected. %d listeners added. ' +
-                      'Use emitter.setMaxListeners() to increase limit.',
-                      this._events[type].length);
-        console.trace();
-      }
-    }
   } else {
     // Adding the second element, need to change to array.
     this._events[type] = [this._events[type], listener];
+
+  }
+
+  // Check for listener leak
+  if (isArray(this._events[type]) && !this._events[type].warned) {
+    var m;
+    if (this._maxListeners !== undefined) {
+      m = this._maxListeners;
+    } else {
+      m = defaultMaxListeners;
+    }
+
+    if (m && m > 0 && this._events[type].length > m) {
+      this._events[type].warned = true;
+      console.error('(node) warning: possible EventEmitter memory ' +
+                    'leak detected. %d listeners added. ' +
+                    'Use emitter.setMaxListeners() to increase limit.',
+                    this._events[type].length);
+      console.trace();
+    }
   }
 
   return this;

diff --git a/test/simple/test-event-emitter-check-listener-leaks.js b/test/simple/test-event-emitter-check-listener-leaks.js
@@ -41,6 +41,13 @@ assert.ok(!e._events['specific'].hasOwnProperty('warned'));
 e.on('specific', function() {});
 assert.ok(e._events['specific'].warned);
 
+// only one
+e.setMaxListeners(1);
+e.on('only one', function() {});
+assert.ok(!e._events['only one'].hasOwnProperty('warned'));
+e.on('only one', function() {});
+assert.ok(e._events['only one'].hasOwnProperty('warned'));
+
 // unlimited
 e.setMaxListeners(0);
 for (var i = 0; i < 1000; i++) {