SERVER-47994 Fix for numerical overflow in GeoHash

1 files changed, 11 insertions, 2 deletions

diff --git a/src/mongo/db/geo/hash.cpp b/src/mongo/db/geo/hash.cpp
index 41c6801bf63..c1170efd57e 100644
--- a/src/mongo/db/geo/hash.cpp
+++ b/src/mongo/db/geo/hash.cpp
@@ -687,21 +687,30 @@ Status GeoHashConverter::parseParameters(const BSONObj& paramDoc,
                                     << "but " << params->bits << " bits were specified");
     }
 
-    if (params->min >= params->max) {
+    const bool rangeValid = params->min < params->max;
+    if (!rangeValid || std::isinf(params->min) || std::isinf(params->max)) {
         return Status(ErrorCodes::InvalidOptions,
                       str::stream() << "region for hash must be valid and have positive area, "
                                     << "but [" << params->min << ", " << params->max << "] "
                                     << "was specified");
     }
 
-    double numBuckets = (1024 * 1024 * 1024 * 4.0);
+    constexpr double numBuckets = 4.0 * 1024 * 1024 * 1024;
     params->scaling = numBuckets / (params->max - params->min);
+    const bool scalingValid = params->scaling > 0;
+    if (!scalingValid || std::isinf(params->scaling)) {
+        return Status(ErrorCodes::InvalidOptions,
+                      str::stream()
+                          << "range [" << params->min << ", " << params->max << "] is too small.");
+    }
 
     return Status::OK();
 }
 
 GeoHashConverter::GeoHashConverter(const Parameters& params) : _params(params) {
     init();
+    uassert(
+        4799400, "Invalid GeoHashConverter parameters", _params.max - _params.min >= _error / 2);
 }
 
 void GeoHashConverter::init() {