Skip to content

Commit 1e9f8e8

Browse files
idrismickhansen
authored andcommitted
deepMerge on strings causes an infinite loop. (#218)
Don't recurse to strings and other non-objects.
1 parent 67c56ad commit 1e9f8e8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/simplifyAST.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ function deepMerge(a, b) {
22
Object.keys(b).forEach(function (key) {
33
if (['fields', 'args'].indexOf(key) !== -1) return;
44

5-
if (a[key] && b[key]) {
5+
if (a[key] && b[key] && typeof a[key] === 'object' && typeof b[key] === 'object') {
66
a[key] = deepMerge(a[key], b[key]);
77
} else {
88
a[key] = b[key];

0 commit comments

Comments
 (0)