From: jeresig <jeresig@gmail.com>
Date: Thu, 7 Jan 2010 16:54:26 +0000 (-0500)
Subject: Back out the try/catch logic from around JSON.parse. We should always try to use... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=c14fa516ae5525f93af562910d22f0a836ebdde3;p=jquery.git

Back out the try/catch logic from around JSON.parse. We should always try to use it, otherwise security will suffer.
---

diff --git a/src/ajax.js b/src/ajax.js
index 35d83e4..9b8e800 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -578,10 +578,10 @@ jQuery.extend({
 			// Get the JavaScript object, if JSON is used.
 			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
 				// Try to use the native JSON parser first
-				try {
-					data = JSON.parse( data );
+				if ( window.JSON && window.JSON.parse ) {
+					data = window.JSON.parse( data );
 
-				} catch(e) {
+				} else {
 					data = (new Function("return " + data))();
 				}
 			}