Skip to content

[3.9] Backport jQuery Security Fix #24533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 3 commits into from
Apr 9, 2019
Merged

[3.9] Backport jQuery Security Fix #24533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b0130a
Backport jQuery Security Fix
SniperSister Apr 9, 2019
151a552
added modification note to file header
SniperSister Apr 9, 2019
4ff8638
cs fix
SniperSister Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion media/jui/js/jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*
* Modified by Joomla: Mitigate possible XSS vulnerability (gh-2432), CMS Issue 19464; Prevent Object Prototype Polution, https://github.com/jquery/jquery/pull/4333
*/

(function( global, factory ) {
Expand Down Expand Up @@ -210,7 +212,8 @@ jQuery.extend = jQuery.fn.extend = function() {
copy = options[ name ];

// Prevent never-ending loop
if ( target === copy ) {
// ADDED by Joomla: Prevent Object Prototype Polution, see https://github.com/jquery/jquery/pull/4333
if ( name === "__proto__" || target === copy ) {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion media/jui/js/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.