library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Prevent Object.prototype pollution for $.extend( true, ... )

Browse Source 
Closes gh-4333
This commit is contained in:
Michał Gołębiowski-Owczarek 2019-03-25 17:57:30 +01:00 committed by GitHub
parent 669f720edc
commit 753d591aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core.js
View File

@ -158,8 +158,9 @@ jQuery.extend = jQuery.fn.extend = function() {
for ( name in options ) { for ( name in options ) {
copy = options[ name ]; copy = options[ name ];
// Prevent Object.prototype pollution
// Prevent never-ending loop // Prevent never-ending loop
if ( target === copy ) { if ( name === "__proto__" || target === copy ) {
continue; continue;
} }

7
test/unit/core.js
View File

@ -1062,6 +1062,13 @@ QUnit.test( "jQuery.extend(true,{},{a:[], o:{}}); deep copy with array, followed
assert.ok( !Array.isArray( result.object ), "result.object wasn't paved with an empty array" ); assert.ok( !Array.isArray( result.object ), "result.object wasn't paved with an empty array" );
} ); } );
QUnit.test( "jQuery.extend( true, ... ) Object.prototype pollution", function( assert ) {
assert.expect( 1 );
jQuery.extend( true, {}, JSON.parse( "{\"__proto__\": {\"devMode\": true}}" ) );
assert.ok( !( "devMode" in {} ), "Object.prototype not polluted" );
} );
QUnit.test( "jQuery.each(Object,Function)", function( assert ) { QUnit.test( "jQuery.each(Object,Function)", function( assert ) {
assert.expect( 23 ); assert.expect( 23 );