From f0010ea3a8f1d5c006c5a0ae3bd3bf6ef47b849a Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Mon, 7 Sep 2015 22:51:33 -0700 Subject: [PATCH] Add additional guard to `isCombo` check in `mergeData`. --- lodash.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lodash.js b/lodash.js index fed6cd91e..c63dc3116 100644 --- a/lodash.js +++ b/lodash.js @@ -4270,9 +4270,9 @@ isCommon = newBitmask < ARY_FLAG; var isCombo = - (srcBitmask == ARY_FLAG && bitmask == CURRY_FLAG) || - (srcBitmask == ARY_FLAG && bitmask == REARG_FLAG && data[7].length <= source[8]) || - (srcBitmask == (ARY_FLAG | REARG_FLAG) && bitmask == CURRY_FLAG); + (srcBitmask == ARY_FLAG && (bitmask == CURRY_FLAG)) || + (srcBitmask == ARY_FLAG && (bitmask == REARG_FLAG) && (data[7].length <= source[8])) || + (srcBitmask == (ARY_FLAG | REARG_FLAG) && (source[7].length <= source[8]) && (bitmask == CURRY_FLAG)); // Exit early if metadata can't be merged. if (!(isCommon || isCombo)) {