Avoid errors caused by extension names or parameters having names tha…

…t clash with things in Object.prototype.
faye · Nov 11, 2017 · e3aa524 · e3aa524
1 parent 1e58c14
commit e3aa524
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -8,6 +8,8 @@ var TOKEN    = /([!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)/,
     EXT_LIST = new RegExp('^' + EXT.source + '(?: *, *' + EXT.source + ')*$'),
     NUMBER   = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?$/;
 
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
 var Parser = {
   parseHeader: function(header) {
     var offers = new Offers();
@@ -35,7 +37,7 @@ var Parser = {
         }
         if (NUMBER.test(data)) data = parseFloat(data);
 
-        if (offer.hasOwnProperty(key)) {
+        if (hasOwnProperty.call(offer, key)) {
           offer[key] = [].concat(offer[key]);
           offer[key].push(data);
         } else {
@@ -77,7 +79,9 @@ var Offers = function() {
 };
 
 Offers.prototype.push = function(name, params) {
-  this._byName[name] = this._byName[name] || [];
+  if (!hasOwnProperty.call(this._byName, name))
+    this._byName[name] = [];
+
   this._byName[name].push(params);
   this._inOrder.push({name: name, params: params});
 };

diff --git a/spec/parser_spec.js b/spec/parser_spec.js
@@ -67,6 +67,17 @@ test.describe("Parser", function() { with(this) {
                     {name: "a", params: {b: true}}],
                    parse('a; b=1, c, b; d, c; e="hi, there"; e, a; b') )
     }})
+
+    it("parses an extension name that shadows an Object property", function() { with(this) {
+      assertEqual( [{name: "hasOwnProperty", params: {}}],
+                   parse('hasOwnProperty') )
+    }})
+
+    it("parses an extension param that shadows an Object property", function() { with(this) {
+      var result = parse('foo; hasOwnProperty; x')[0]
+      assertEqual( result.params.hasOwnProperty, true )
+    }})
+
   }})
 
   describe("serializeParams", function() { with(this) {