github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-02 22:55:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #12751. Ensure parseJson throws in the same situations as JSON.parse. Close gh-993.

Browse Source
This commit is contained in:
James Huston
2012-10-16 14:51:54 -04:00
committed by Dave Methvin
parent c31539c8a2
commit ee9687d441
4 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/core.js
View File

@@ -488,27 +488,32 @@ jQuery.extend({
},
parseJSON: function( data ) {
if ( !data || typeof data !== "string") {
return null;
}
// 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, "")) ) {
return ( new Function( "return " + data ) )();
if ( data === null ) {
return data;
}
if ( typeof data === "string" ) {
// Make sure leading/trailing whitespace is removed (IE can't handle it)
data = jQuery.trim( data );
if ( 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, "")) ) {
return ( new Function( "return " + data ) )();
}
}
}
jQuery.error( "Invalid JSON: " + data );
},