SERVER-60588 Don't attempt to coerce a double product to long

(cherry picked from commit d0a023d1cba8782c761890c20752ecf494d22a62)

1 files changed, 9 insertions, 5 deletions

diff --git a/src/mongo/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp
index f35cd8c81b3..8fcd1fa7d99 100644
--- a/src/mongo/db/pipeline/expression.cpp
+++ b/src/mongo/db/pipeline/expression.cpp
@@ -3123,11 +3123,15 @@ public:
         } else {
             doubleProduct *= val.coerceToDouble();
 
-            if (!std::isfinite(val.coerceToDouble()) ||
-                overflow::mul(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()) ||
+                    overflow::mul(longProduct, val.coerceToLong(), &longProduct)) {
+                    // The multiplier is either Infinity or NaN, or the `longProduct` would
+                    // have overflowed, so we're abandoning it.
+                    productType = NumberDouble;
+                }
             }
         }
     }