Commit9c6f64c

authored

Core: Don't rely on splice being present on input

Without this fix calling `jQuery.uniqueSort` on an array-like can result in:TypeError: results.splice is not a function at Function.jQuery.uniqueSort (https://code.jquery.com/jquery-git.js:664:12) at jQuery.fn.init.find (https://code.jquery.com/jquery-git.js:2394:27) at gocusihafe.js:3:4Closesgh-4986

1 parenteb9ceb2 commit9c6f64cCopy full SHA for 9c6f64c

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`importjQueryfrom"../core.js";`
`2`	`2`	`importdocumentfrom"../var/document.js";`
`3`	`3`	`importsortfrom"../var/sort.js";`
	`4`	`+importsplicefrom"../var/splice.js";`
`4`	`5`
`5`	`6`	`varhasDuplicate;`
`6`	`7`
`@@ -80,7 +81,7 @@ jQuery.uniqueSort = function( results ) {`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`while(j--){`
`83`		`-results.splice(duplicates[j],1);`
	`84`	`+splice.call(results,duplicates[j],1);`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`

Lines changed: 3 additions & 0 deletions

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1895,9 +1895,7 @@ QUnit.test( "jQuery.uniqueSort", function( assert ) {`
`1895`	`1895`	`}`
`1896`	`1896`	`}`
`1897`	`1897`	`Arrayish.prototype={`
`1898`		`-slice:[].slice,`
`1899`		`-sort:[].sort,`
`1900`		`-splice:[].splice`
	`1898`	`+sliceForTestOnly:[].slice`
`1901`	`1899`	`};`
`1902`	`1900`
`1903`	`1901`	`vari,tests,`
`@@ -1959,8 +1957,12 @@ QUnit.test( "jQuery.uniqueSort", function( assert ) {`
`1959`	`1957`
`1960`	`1958`	`jQuery.each(tests,function(label,test){`
`1961`	`1959`	`varlength=test.length\|\|test.input.length;`
`1962`		`-assert.deepEqual(jQuery.uniqueSort(test.input).slice(0,length),test.expected,label+" (array)");`
`1963`		`-assert.deepEqual(jQuery.uniqueSort(newArrayish(test.input)).slice(0,length),test.expected,label+" (quasi-array)");`
	`1960`	+// We duplicate `test.input` because otherwise it is modified by `uniqueSort`
	`1961`	`+// and the second test becomes worthless.`
	`1962`	`+assert.deepEqual(jQuery.uniqueSort(test.input.slice(0)).slice(0,length),`
	`1963`	`+test.expected,label+" (array)");`
	`1964`	`+assert.deepEqual(jQuery.uniqueSort(newArrayish(test.input)).sliceForTestOnly(0,length),`
	`1965`	`+test.expected,label+" (quasi-array)");`
`1964`	`1966`	`});`
`1965`	`1967`	`});`
`1966`	`1968`

Comments

(0)