From c14fa516ae5525f93af562910d22f0a836ebdde3 Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 7 Jan 2010 11:54:26 -0500 Subject: [PATCH] Back out the try/catch logic from around JSON.parse. We should always try to use it, otherwise security will suffer. --- src/ajax.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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))(); } } -- 1.7.10.4