Wrap the JSON parsing calls with a try/catch expression to catch Synt…

…axErrors various libraries throw to signal malformed json.
dantman · Feb 17, 2009 · f8e62c0 · f8e62c0
1 parent 2cef3eb
commit f8e62c0
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -539,11 +539,16 @@ jQuery.extend({
 	},
 
 	json: function( data ) {
-		var func = ( window.JSON && window.JSON.parse ) // Native JSON and json2.js
-			|| window.json_parse // json_parse.js and json_parse_state.js
-			|| window.jsonParse; // json_sans_eval.js
+		try {
+			var func = ( window.JSON && window.JSON.parse ) // Native JSON and json2.js
+				|| window.json_parse // json_parse.js and json_parse_state.js
+				|| window.jsonParse; // json_sans_eval.js
 
-		return func ? func( data ) : window["eval"]("(" + data + ")");
+			return func ? func( data ) : window["eval"]("(" + data + ")");
+		} catch (err) {
+			if(err.name != "SyntaxError") throw err;
+			return false;
+		}
 	}
 
 });