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

Avoid stack overflow with _.defaultsDeep.

Browse Source
This commit is contained in:
John-David Dalton
2015-08-13 01:30:24 -07:00
parent 9f0dd40b3b
commit dd472f489b
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lodash.js
View File

@@ -2313,7 +2313,8 @@
srcValue = source[key];
while (length--) {
if (stackA[length] == srcValue) {
var stacked = stackA[length];
if (stacked == srcValue || stacked == oldValue) {
assignMergeValue(object, key, stackB[length]);
return;
}
@@ -4073,15 +4074,12 @@
* @returns {*} Returns the value to assign to the destination object.
*/
function mergeDefaults(objectValue, sourceValue, key, object, source, stackA, stackB) {
if (objectValue === undefined) {
return sourceValue;
}
if (isObject(objectValue)) {
stackA.push(objectValue);
stackB.push(objectValue);
return baseMerge(objectValue, sourceValue, mergeDefaults, stackA, stackB);
baseMerge(objectValue, sourceValue, mergeDefaults, stackA, stackB);
}
return objectValue;
return objectValue === undefined ? sourceValue : objectValue;
}
/**