SERVER-24071 Use ChunkRange for parsing and creating chunk bounds

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/s/catalog/type_chunk.cpp b/src/mongo/s/catalog/type_chunk.cpp
index c366f1b1514..07e07fdf370 100644
--- a/src/mongo/s/catalog/type_chunk.cpp
+++ b/src/mongo/s/catalog/type_chunk.cpp
@@ -70,6 +70,10 @@ StatusWith<ChunkRange> ChunkRange::fromBSON(const BSONObj& obj) {
             return {minKeyStatus.code(),
                     str::stream() << "Invalid min key due to " << minKeyStatus.reason()};
         }
+
+        if (minKey.Obj().isEmpty()) {
+            return {ErrorCodes::BadValue, "The min key cannot be empty"};
+        }
     }
 
     BSONElement maxKey;
@@ -79,6 +83,10 @@ StatusWith<ChunkRange> ChunkRange::fromBSON(const BSONObj& obj) {
             return {maxKeyStatus.code(),
                     str::stream() << "Invalid max key due to " << maxKeyStatus.reason()};
         }
+
+        if (maxKey.Obj().isEmpty()) {
+            return {ErrorCodes::BadValue, "The max key cannot be empty"};
+        }
     }
 
     return ChunkRange(minKey.Obj().getOwned(), maxKey.Obj().getOwned());