From: jeresig <jeresig@gmail.com>
Date: Mon, 11 Jan 2010 21:43:21 +0000 (-0500)
Subject: Make sure we do the malformed JSON check for all both JSON.parse and new Function... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=44e6beb10304789044de2c5a58f5bb82e8321636;hp=--cc;p=jquery.git

Make sure we do the malformed JSON check for all both JSON.parse and new Function (this helps to create uniformity between browser implementations of JSON.parse - like where Chrome allows some malformed strings. Thanks to DBJDBJ for the heads-up.
---

44e6beb10304789044de2c5a58f5bb82e8321636
diff --git a/src/ajax.js b/src/ajax.js
index 73e1db6..193a85a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -572,19 +572,22 @@ jQuery.extend({
 		if ( typeof data === "string" ) {
 			// Get the JavaScript object, if JSON is used.
 			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				// Try to use the native JSON parser first
-				if ( window.JSON && window.JSON.parse ) {
-					data = window.JSON.parse( data );
-
 				// Make sure the incoming data is actual JSON
 				// Logic borrowed from http://json.org/json2.js
-				} else if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+				if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
 					.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
 					.replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+					// Try to use the native JSON parser first
+					if ( window.JSON && window.JSON.parse ) {
+						data = window.JSON.parse( data );
+
+					} else {
 						data = (new Function("return " + data))();
+					}
 
 				} else {
-					throw "JSON.parse";
+					throw "Invalid JSON: " + data;
 				}
 
 			// If the type is "script", eval it in global context