[Fix] utils.merge: avoid a crash with a null target and an array so…

…urce
ljharb · Feb 3, 2019 · 31bcb32 · 31bcb32
1 parent 98c93d6
commit 31bcb32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/utils.js b/lib/utils.js
@@ -64,7 +64,7 @@ var merge = function merge(target, source, options) {
         return target;
     }
 
-    if (typeof target !== 'object') {
+    if (!target || typeof target !== 'object') {
         return [target].concat(source);
     }
 

diff --git a/test/utils.js b/test/utils.js
@@ -6,6 +6,8 @@ var utils = require('../lib/utils');
 test('merge()', function (t) {
     t.deepEqual(utils.merge(null, true), [null, true], 'merges true into null');
 
+    t.deepEqual(utils.merge(null, [42]), [null, 42], 'merges null into an array');
+
     t.deepEqual(utils.merge({ a: 'b' }, { a: 'c' }), { a: ['b', 'c'] }, 'merges two objects with the same key');
 
     var oneMerged = utils.merge({ foo: 'bar' }, { foo: { first: '123' } });