Skip to content

Fix jQuery #12337: harden position caching against DOM manipulation #153

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

Closed
gibson042 wants to merge 1 commit into from
Closed

Fix jQuery #12337: harden position caching against DOM manipulation #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 16 additions & 19 deletions sizzle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,37 +611,34 @@ Expr = Sizzle.selectors = {
var doneName = done++;

return function( elem ) {
var parent, diff,
count = 0,
node = elem;
var node, diff,
childkey = doneName + "." + dirruns + ".",
parent = elem.parentNode,
sizset = elem.sizset;

if ( first === 1 && last === 0 ) {
return true;
}

parent = elem.parentNode;

if ( parent && (parent[ expando ] !== doneName || !elem.sizset) ) {
if ( typeof sizset === "string" && sizset.indexOf( childkey ) === 0 ) {
diff = sizset.substr( childkey.length );
} else if ( parent ) {
diff = 0;
for ( node = parent.firstChild; node; node = node.nextSibling ) {
if ( node.nodeType === 1 ) {
node.sizset = ++count;
if ( node === elem ) {
node.sizset = childkey + (++diff);
if ( elem === node ) {
break;
}
}
}

parent[ expando ] = doneName;
}

diff = elem.sizset - last;
diff -= last;

if ( first === 0 ) {
return diff === 0;

} else {
return ( diff % first === 0 && diff / first >= 0 );
}
return first === 0 ?
diff === 0 :
diff % first === 0 && diff / first >= 0;
};
}

Expand Down Expand Up @@ -1096,8 +1093,8 @@ function addCombinator( matcher, combinator, context, xml ) {
} :
function( elem ) {
var cache,
dirkey = doneName + "." + dirruns,
cachedkey = dirkey + "." + cachedruns;
dirkey = doneName + "." + dirruns + ".",
cachedkey = dirkey + cachedruns;
while ( (elem = elem[ dir ]) ) {
if ( elem.nodeType === 1 ) {
if ( (cache = elem[ expando ]) === cachedkey ) {
Expand Down
9 changes: 5 additions & 4 deletions test/unit/selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ test("attributes", function() {
});

test("pseudo - child", function() {
expect( 41 );
expect( 42 );
t( "First Child", "#qunit-fixture p:first-child", ["firstp","sndp"] );
t( "First Child (case-insensitive)", "#qunit-fixture p:FIRST-CHILD", ["firstp","sndp"] );
t( "Last Child", "p:last-child", ["sap"] );
Expand All @@ -528,10 +528,11 @@ test("pseudo - child", function() {
t( "Not Nth Child", "#qunit-fixture p:not(:nth-child(1))", ["ap","en","sap","first"] );

// Verify that the child position isn't being cached improperly
jQuery("p:first-child").after("<div></div>");
jQuery("p:first-child").before("<div></div>").next().remove();
var firstChildren = jQuery("p:first-child").before("<div></div>");

t( "First Child", "p:first-child", [] );
t( "No longer First Child", "p:nth-child(1)", [] );
firstChildren.prev().remove();
t( "Restored First Child", "p:nth-child(1)", ["firstp","sndp"] );

QUnit.reset();

Expand Down