Skip to content

Fix TypeError in _.max/_.min on nullish collection with numeric iteratee #3018

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

Open
dkempner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix TypeError in _.max/_.min on nullish collection with numeric iteratee #3018

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
2 changes: 1 addition & 1 deletion modules/max.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import each from './each.js';
export default function max(obj, iteratee, context) {
var result = -Infinity, lastComputed = -Infinity,
value, computed;
if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
if (iteratee == null || (typeof iteratee == 'number' && obj != null && typeof obj[0] != 'object')) {
obj = isArrayLike(obj) ? obj : values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
Expand Down
2 changes: 1 addition & 1 deletion modules/min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import each from './each.js';
export default function min(obj, iteratee, context) {
var result = Infinity, lastComputed = Infinity,
value, computed;
if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
if (iteratee == null || (typeof iteratee == 'number' && obj != null && typeof obj[0] != 'object')) {
obj = isArrayLike(obj) ? obj : values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
Expand Down
4 changes: 4 additions & 0 deletions test/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@
assert.strictEqual(_.max(null), -Infinity, 'can handle null/undefined');
assert.strictEqual(_.max(void 0), -Infinity, 'can handle null/undefined');
assert.strictEqual(_.max(null, _.identity), -Infinity, 'can handle null/undefined');
assert.strictEqual(_.max(null, 0), -Infinity, 'can handle null/undefined with a numeric iteratee');
assert.strictEqual(_.max(void 0, 0), -Infinity, 'can handle null/undefined with a numeric iteratee');

assert.strictEqual(_.max([1, 2, 3]), 3, 'can perform a regular Math.max');

Expand Down Expand Up @@ -626,6 +628,8 @@
assert.strictEqual(_.min(null), Infinity, 'can handle null/undefined');
assert.strictEqual(_.min(void 0), Infinity, 'can handle null/undefined');
assert.strictEqual(_.min(null, _.identity), Infinity, 'can handle null/undefined');
assert.strictEqual(_.min(null, 0), Infinity, 'can handle null/undefined with a numeric iteratee');
assert.strictEqual(_.min(void 0, 0), Infinity, 'can handle null/undefined with a numeric iteratee');

assert.strictEqual(_.min([1, 2, 3]), 1, 'can perform a regular Math.min');

Expand Down
4 changes: 2 additions & 2 deletions underscore-esm.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion underscore-esm.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions underscore-node-f.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ function where(obj, attrs) {
function max(obj, iteratee, context) {
var result = -Infinity, lastComputed = -Infinity,
value, computed;
if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
if (iteratee == null || (typeof iteratee == 'number' && obj != null && typeof obj[0] != 'object')) {
obj = isArrayLike(obj) ? obj : values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
Expand All @@ -1520,7 +1520,7 @@ function max(obj, iteratee, context) {
function min(obj, iteratee, context) {
var result = Infinity, lastComputed = Infinity,
value, computed;
if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
if (iteratee == null || (typeof iteratee == 'number' && obj != null && typeof obj[0] != 'object')) {
obj = isArrayLike(obj) ? obj : values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
Expand Down
2 changes: 1 addition & 1 deletion underscore-node-f.cjs.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions underscore-umd.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion underscore-umd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading