Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Fix util extend issue #25672

Closed
wants to merge 2 commits into from
Closed

Fix util extend issue #25672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7023eff
util: fix _extend to allow undefined "origin"
itkoren Jul 13, 2015
67ab194
util: fix _extend to allow undefined "origin"
itkoren Jul 13, 2015
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
3 changes: 3 additions & 0 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,9 @@ exports._extend = function(origin, add) {
// Don't do anything if add isn't an object
if (!add || typeof add !== 'object') return origin;

// Return add if origin isn't an object
if (!origin || typeof origin !== 'object') return add;

var keys = Object.keys(add);
var i = keys.length;
while (i--) {
Expand Down
4 changes: 4 additions & 0 deletions test/simple/test-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@ assert.deepEqual(util._extend({a:1}, true), {a:1});
assert.deepEqual(util._extend({a:1}, false), {a:1});
assert.deepEqual(util._extend({a:1}, {b:2}), {a:1, b:2});
assert.deepEqual(util._extend({a:1, b:2}, {b:3}), {a:1, b:3});
assert.deepEqual(util._extend(null, {a:1}), {a:1});
assert.deepEqual(util._extend(undefined, {a:1}), {a:1});
assert.deepEqual(util._extend(true, {a:1}), {a:1});
assert.deepEqual(util._extend(false, {a:1}), {a:1});