Fix issue 51: Guard against object with own property "hasOwnProperty"

Krinkle · Krinkle · commit 7617ed7c9e5d · 2011-09-25T16:21:25.000Z
* Previously caused an exception to be thrown in such case
* Added test case to confirm
* Rebuild the *.min.js
* Rename 2.3-edge to 2.4-edge. This is the edge / development version that will become 2.4. 2.3 has already been released.
diff --git a/src/jquery.json.js b/src/jquery.json.js
@@ -1,5 +1,5 @@
 /**
- * jQuery JSON Plugin v2.3-edge (2011-09-18)
+ * jQuery JSON Plugin v2.3-edge (2011-09-25)
  *
  * @author Brantley Harris, 2009-2011
  * @author Timo Tijhof, 2011
@@ -23,7 +23,8 @@
 			'\r': '\\r',
 			'"' : '\\"',
 			'\\': '\\\\'
-		};
+		},
+		hasOwn = Object.prototype.hasOwnProperty;
 
 	/**
 	 * jQuery.toJSON
@@ -106,7 +107,7 @@
 			for ( var k in o ) {
 				// Only include own properties,
 				// Filter out inherited prototypes
-				if ( !o.hasOwnProperty( k ) ) {
+				if ( !hasOwn.call( o, k ) ) {
 					continue;
 				}
 
diff --git a/src/jquery.json.min.js b/src/jquery.json.min.js
@@ -1,5 +1,5 @@
 
-(function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};$.toJSON=typeof JSON==='object'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return'null';}
+(function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},hasOwn=Object.prototype.hasOwnProperty;$.toJSON=typeof JSON==='object'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return'null';}
 var type=typeof o;if(type==='undefined'){return undefined;}
 if(type==='number'||type==='boolean'){return''+o;}
 if(type==='string'){return $.quoteString(o);}
@@ -15,7 +15,7 @@ return'"'+year+'-'+month+'-'+day+'T'+
 hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
 if(o.constructor===Array){var ret=[];for(var i=0;i<o.length;i++){ret.push($.toJSON(o[i])||'null');}
 return'['+ret.join(',')+']';}
-var name,val,pairs=[];for(var k in o){if(!o.hasOwnProperty(k)){continue;}
+var name,val,pairs=[];for(var k in o){if(!hasOwn.call(o,k)){continue;}
 type=typeof k;if(type==='number'){name='"'+k+'"';}else if(type==='string'){name=$.quoteString(k);}else{continue;}
 type=typeof o[k];if(type==='function'||type==='undefined'){continue;}
 val=$.toJSON(o[k]);pairs.push(name+':'+val);}
diff --git a/test/jquery.json.test.js b/test/jquery.json.test.js
@@ -168,6 +168,7 @@ test( 'Undefined and null', function(){
 
 
 });
+
 test( 'Prototype inheritance', function(){
 
     Object.prototype.AWESOME = 7;
@@ -189,4 +190,15 @@ test( 'Prototype inheritance', function(){
         delete Object.prototype.AWESOME;
     } catch(e){}
 
-})
+});
+
+test( '"hasOwnProperty" mixup', function(){
+
+	testToJSON(
+		{ isAwesome: true, hasOwnProperty: false },
+		'{"isAwesome":true,"hasOwnProperty":false}',
+		'Guard against inherited prototypes should not depend on prototype inheritance itself'
+	);
+
+
+});
