From b7d76a1a7ba441ffb5dd0da05a226295f7a3a17c Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 17 Jan 2013 13:20:22 -0800 Subject: [PATCH] Revert "events: Don't crash on events named __proto__" Unfortunately, it's just too slow to do this in events.js. Users will just have to live with not having events named __proto__ or toString. This reverts commit b48e303af023dc60b6f6590694ba94d9b8108702. --- lib/events.js | 67 +++++++++---------- ...test-event-emitter-check-listener-leaks.js | 14 ++-- ...st-event-emitter-listeners-side-effects.js | 12 ++-- .../test-event-emitter-prototype-property.js | 37 ---------- 4 files changed, 44 insertions(+), 86 deletions(-) delete mode 100644 test/simple/test-event-emitter-prototype-property.js diff --git a/lib/events.js b/lib/events.js index 5093f4ef1f..223015ec60 100644 --- a/lib/events.js +++ b/lib/events.js @@ -53,8 +53,8 @@ var PROCESS; EventEmitter.prototype.emit = function(type) { // If there is no 'error' event listener then throw. if (type === 'error') { - if (!this._events || !this._events.everror || - (isArray(this._events.everror) && !this._events.everror.length)) + if (!this._events || !this._events.error || + (isArray(this._events.error) && !this._events.error.length)) { if (this.domain) { var er = arguments[1]; @@ -75,8 +75,7 @@ EventEmitter.prototype.emit = function(type) { } if (!this._events) return false; - var evtype = 'ev' + type; - var handler = this._events[evtype]; + var handler = this._events[type]; if (!handler) return false; if (typeof handler == 'function') { @@ -143,37 +142,36 @@ EventEmitter.prototype.addListener = function(type, listener) { // To avoid recursion in the case that type == "newListener"! Before // adding it to the listeners, first emit "newListener". - if (this._events.evnewListener) { + if (this._events.newListener) { this.emit('newListener', type, typeof listener.listener === 'function' ? listener.listener : listener); } - var evtype = 'ev' + type; - if (!this._events[evtype]) { + if (!this._events[type]) { // Optimize the case of one listener. Don't need the extra array object. - this._events[evtype] = listener; - } else if (isArray(this._events[evtype])) { + this._events[type] = listener; + } else if (isArray(this._events[type])) { // If we've already got an array, just append. - this._events[evtype].push(listener); + this._events[type].push(listener); } else { // Adding the second element, need to change to array. - this._events[evtype] = [this._events[evtype], listener]; + this._events[type] = [this._events[type], listener]; } // Check for listener leak - if (isArray(this._events[evtype]) && !this._events[evtype].warned) { + if (isArray(this._events[type]) && !this._events[type].warned) { var m; m = this._maxListeners; - if (m && m > 0 && this._events[evtype].length > m) { - this._events[evtype].warned = true; + 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[evtype].length); + this._events[type].length); console.trace(); } } @@ -206,11 +204,10 @@ EventEmitter.prototype.removeListener = function(type, listener) { throw new Error('removeListener only takes instances of Function'); } - var evtype = 'ev' + type; - // does not use listeners(), so no side effect of creating _events[evtype] - if (!this._events || !this._events[evtype]) return this; + // does not use listeners(), so no side effect of creating _events[type] + if (!this._events || !this._events[type]) return this; - var list = this._events[evtype]; + var list = this._events[type]; if (isArray(list)) { var position = -1; @@ -226,17 +223,17 @@ EventEmitter.prototype.removeListener = function(type, listener) { if (position < 0) return this; list.splice(position, 1); if (list.length == 0) - this._events[evtype] = null; + this._events[type] = null; - if (this._events.evremoveListener) { + if (this._events.removeListener) { this.emit('removeListener', type, listener); } } else if (list === listener || (list.listener && list.listener === listener)) { - this._events[evtype] = null; + this._events[type] = null; - if (this._events.evremoveListener) { + if (this._events.removeListener) { this.emit('removeListener', type, listener); } } @@ -248,11 +245,11 @@ EventEmitter.prototype.removeAllListeners = function(type) { if (!this._events) return this; // fast path - if (!this._events.evremoveListener) { + if (!this._events.removeListener) { if (arguments.length === 0) { this._events = {}; - } else if (type && this._events && this._events['ev' + type]) { - this._events['ev' + type] = null; + } else if (type && this._events && this._events[type]) { + this._events[type] = null; } return this; } @@ -260,16 +257,15 @@ EventEmitter.prototype.removeAllListeners = function(type) { // slow(ish) path, emit 'removeListener' events for all removals if (arguments.length === 0) { for (var key in this._events) { - if (key === 'evremoveListener') continue; - this.removeAllListeners(key.slice(2)); + if (key === 'removeListener') continue; + this.removeAllListeners(key); } this.removeAllListeners('removeListener'); this._events = {}; return this; } - var evtype = 'ev' + type; - var listeners = this._events[evtype]; + var listeners = this._events[type]; if (isArray(listeners)) { while (listeners.length) { // LIFO order @@ -278,16 +274,15 @@ EventEmitter.prototype.removeAllListeners = function(type) { } else if (listeners) { this.removeListener(type, listeners); } - this._events[evtype] = null; + this._events[type] = null; return this; }; EventEmitter.prototype.listeners = function(type) { - var evtype = 'ev' + type; - if (!this._events || !this._events[evtype]) return []; - if (!isArray(this._events[evtype])) { - return [this._events[evtype]]; + if (!this._events || !this._events[type]) return []; + if (!isArray(this._events[type])) { + return [this._events[type]]; } - return this._events[evtype].slice(0); + return this._events[type].slice(0); }; diff --git a/test/simple/test-event-emitter-check-listener-leaks.js b/test/simple/test-event-emitter-check-listener-leaks.js index 1aa54bf4cf..7d9c203243 100644 --- a/test/simple/test-event-emitter-check-listener-leaks.js +++ b/test/simple/test-event-emitter-check-listener-leaks.js @@ -29,30 +29,30 @@ var e = new events.EventEmitter(); for (var i = 0; i < 10; i++) { e.on('default', function() {}); } -assert.ok(!e._events.evdefault.hasOwnProperty('warned')); +assert.ok(!e._events['default'].hasOwnProperty('warned')); e.on('default', function() {}); -assert.ok(e._events.evdefault.warned); +assert.ok(e._events['default'].warned); // specific e.setMaxListeners(5); for (var i = 0; i < 5; i++) { e.on('specific', function() {}); } -assert.ok(!e._events.evspecific.hasOwnProperty('warned')); +assert.ok(!e._events['specific'].hasOwnProperty('warned')); e.on('specific', function() {}); -assert.ok(e._events.evspecific.warned); +assert.ok(e._events['specific'].warned); // only one e.setMaxListeners(1); e.on('only one', function() {}); -assert.ok(!e._events['evonly one'].hasOwnProperty('warned')); +assert.ok(!e._events['only one'].hasOwnProperty('warned')); e.on('only one', function() {}); -assert.ok(e._events['evonly one'].hasOwnProperty('warned')); +assert.ok(e._events['only one'].hasOwnProperty('warned')); // unlimited e.setMaxListeners(0); for (var i = 0; i < 1000; i++) { e.on('unlimited', function() {}); } -assert.ok(!e._events['evunlimited'].hasOwnProperty('warned')); +assert.ok(!e._events['unlimited'].hasOwnProperty('warned')); diff --git a/test/simple/test-event-emitter-listeners-side-effects.js b/test/simple/test-event-emitter-listeners-side-effects.js index f60e26b8b2..92a5bef97c 100644 --- a/test/simple/test-event-emitter-listeners-side-effects.js +++ b/test/simple/test-event-emitter-listeners-side-effects.js @@ -37,21 +37,21 @@ assert.equal(e._events, null); e.on('foo', assert.fail); fl = e.listeners('foo'); -assert(e._events.evfoo === assert.fail); +assert(e._events.foo === assert.fail); assert(Array.isArray(fl)); assert(fl.length === 1); assert(fl[0] === assert.fail); e.listeners('bar'); -assert(!e._events.hasOwnProperty('evbar')); +assert(!e._events.hasOwnProperty('bar')); e.on('foo', assert.ok); fl = e.listeners('foo'); -assert(Array.isArray(e._events.evfoo)); -assert(e._events.evfoo.length === 2); -assert(e._events.evfoo[0] === assert.fail); -assert(e._events.evfoo[1] === assert.ok); +assert(Array.isArray(e._events.foo)); +assert(e._events.foo.length === 2); +assert(e._events.foo[0] === assert.fail); +assert(e._events.foo[1] === assert.ok); assert(Array.isArray(fl)); assert(fl.length === 2); diff --git a/test/simple/test-event-emitter-prototype-property.js b/test/simple/test-event-emitter-prototype-property.js deleted file mode 100644 index a5d8a7d04a..0000000000 --- a/test/simple/test-event-emitter-prototype-property.js +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -var common = require('../common'); -var assert = require('assert'); -var events = require('events'); - -var e = new events.EventEmitter(); - -var emited = false; -e.on('__proto__', function() { - emited = true; -}); - -e.emit('__proto__'); - -process.on('exit', function() { - assert.equal(true, emited); -});