Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-10 02:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure stack is popped after recursive merge so that it doesn't affect sibling properties. [closes #2060]

Browse Source
This commit is contained in:
John-David Dalton
2016-02-26 09:33:30 -08:00
parent ff7d79d5fc
commit 0b76654b71
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lodash.js
View File

@@ -3209,6 +3209,7 @@
// Recursively merge objects and arrays (susceptible to call stack limits). // Recursively merge objects and arrays (susceptible to call stack limits).
mergeFunc(newValue, srcValue, srcIndex, customizer, stack); mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
} }
stack['delete'](srcValue);
assignMergeValue(object, key, newValue); assignMergeValue(object, key, newValue);
} }

2
test/test.js
View File

@@ -14023,7 +14023,7 @@
source.bar.b = source.foo.b; source.bar.b = source.foo.b;
var actual = _.merge(object, source); var actual = _.merge(object, source);
assert.ok(actual.bar.b === actual.foo.b && actual.foo.b.c.d === actual.foo.b.c.d.foo.b.c.d); assert.ok(actual.bar.b !== actual.foo.b && actual.foo.b.c.d === actual.foo.b.c.d.foo.b.c.d);
}); });
QUnit.test('should work with four arguments', function(assert) { QUnit.test('should work with four arguments', function(assert) {