[FIX] web/lib: backport jquery bugfixes
opw-2793379 closes odoo/odoo#90463 X-original-commit: 684e3fc983e91168dfaef8536fcd1f71ce7f7fdc
This commit is contained in:
@@ -520,6 +520,7 @@
|
||||
// * Rinse & repeat.
|
||||
for ( ; i <= keys_last; i++ ) {
|
||||
key = keys[i] === '' ? cur.length : keys[i];
|
||||
if ( key === "__proto__" || key === "prototype" || key === "constructor" ) break;
|
||||
cur = cur[key] = i < keys_last
|
||||
? cur[key] || ( keys[i+1] && isNaN( keys[i+1] ) ? {} : [] )
|
||||
: val;
|
||||
|
||||
+1
-1
@@ -262,7 +262,7 @@ jQuery.extend = jQuery.fn.extend = function() {
|
||||
copy = options[ name ];
|
||||
|
||||
// Prevent never-ending loop
|
||||
if ( target === copy ) {
|
||||
if ( name === '__proto__' || target === copy ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user