diff options
author | Jennifer Peshansky <jennifer.peshansky@mongodb.com> | 2021-10-13 20:26:26 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-03 18:15:55 +0000 |
commit | 60ce48d31de63b06dab060bd79533d5aa5b72375 (patch) | |
tree | 0398983cbe0dbcd34ccbe2baa1c8266d72265ba2 | |
parent | f671990a519d035566aef84df2bae540d0f085a1 (diff) | |
download | mongo-60ce48d31de63b06dab060bd79533d5aa5b72375.tar.gz |
SERVER-60588 Don't attempt to coerce a double product to long
(cherry picked from commit d0a023d1cba8782c761890c20752ecf494d22a62)
(cherry picked from commit f6c05d4d028fe6712e81396be335fd144124c561)
(cherry picked from commit 9aa24cb9aaa12578a81361e64a5e57dbe1c34b1e)
-rw-r--r-- | src/mongo/db/pipeline/expression.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mongo/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp index 51c0275efba..5a26f521ab8 100644 --- a/src/mongo/db/pipeline/expression.cpp +++ b/src/mongo/db/pipeline/expression.cpp @@ -2704,11 +2704,17 @@ Value ExpressionMultiply::evaluate(const Document& root, Variables* variables) c decimalProduct = decimalProduct.multiply(val.coerceToDecimal()); } else { doubleProduct *= val.coerceToDouble(); - if (!std::isfinite(val.coerceToDouble()) || - mongoSignedMultiplyOverflow64(longProduct, val.coerceToLong(), &longProduct)) { - // The number is either Infinity or NaN, or the 'longProduct' would have - // overflowed, so we're abandoning it. - productType = NumberDouble; + + if (productType != NumberDouble) { + // If `productType` is not a double, it must be one of the integer types, so we + // attempt to update `longProduct`. + if (!std::isfinite(val.coerceToDouble()) || + mongoSignedMultiplyOverflow64( + longProduct, val.coerceToLong(), &longProduct)) { + // The number is either Infinity or NaN, or the 'longProduct' would have + // overflowed, so we're abandoning it. + productType = NumberDouble; + } } } } else if (val.nullish()) { |