Permalink
Browse files

Bug 7587; Enhancement/1.6 Feature: Bypass regexp filter on $.parseJSO…

…N and use native thrown exceptions if window.JSON.parse is available
  • Loading branch information...
danheberden committed Apr 5, 2011
1 parent 2ed81b4 commit a7e7dbd978b97c55a29b364fd277c4ade1ec22b6
Showing with 11 additions and 9 deletions.
  1. +10 −8 src/core.js
  2. +1 −1 test/unit/ajax.js
View
@@ -515,16 +515,18 @@ jQuery.extend({
// Make sure leading/trailing whitespace is removed (IE can't handle it)
data = jQuery.trim( data );
+ // Attempt to parse using the native JSON parser first
+ if ( window.JSON && window.JSON.parse ) {
+ return window.JSON.parse( data );
+ }
+
// Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js
- if ( rvalidchars.test(data.replace(rvalidescape, "@")
- .replace(rvalidtokens, "]")
- .replace(rvalidbraces, "")) ) {
-
- // Try to use the native JSON parser first
- return window.JSON && window.JSON.parse ?
- window.JSON.parse( data ) :
- (new Function("return " + data))();
+ if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+ .replace( rvalidtokens, "]" )
+ .replace( rvalidbraces, "")) ) {
+
+ return (new Function( "return " + data ))();
} else {
jQuery.error( "Invalid JSON: " + data );
View
@@ -1600,7 +1600,7 @@ test("jQuery.ajax() - malformed JSON", function() {
},
error: function(xhr, msg, detailedMsg) {
equals( "parsererror", msg, "A parse error occurred." );
- ok( /^Invalid JSON/.test(detailedMsg), "Detailed parsererror message provided" );
+ ok( /^(Invalid|SyntaxError|exception)/i.test(detailedMsg), "Detailed parsererror message provided" );
start();
}
});

0 comments on commit a7e7dbd

Please sign in to comment.