SERVER-13537 better handle numerical overflow of large limit values

2 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/exec/sort.cpp b/src/mongo/db/exec/sort.cpp
index e864c0ede85..db7b6a5777d 100644
--- a/src/mongo/db/exec/sort.cpp
+++ b/src/mongo/db/exec/sort.cpp
@@ -283,7 +283,6 @@ namespace mongo {
           _sorted(false),
           _resultIterator(_data.end()),
           _memUsage(0) {
-        dassert(_limit >= 0);
     }
 
     SortStage::~SortStage() { }
diff --git a/src/mongo/db/exec/sort.h b/src/mongo/db/exec/sort.h
index 6221a505524..91fbb0826f4 100644
--- a/src/mongo/db/exec/sort.h
+++ b/src/mongo/db/exec/sort.h
@@ -55,8 +55,8 @@ namespace mongo {
         // The query.  Used to create the IndexBounds for the sorting.
         BSONObj query;
 
-        // Must be >= 0.  Equal to 0 for no limit.
-        int limit;
+        // Equal to 0 for no limit.
+        size_t limit;
     };
 
     /**
@@ -164,8 +164,8 @@ namespace mongo {
         // The raw query as expressed by the user
         BSONObj _query;
 
-        // Must be >= 0.  Equal to 0 for no limit.
-        int _limit;
+        // Equal to 0 for no limit.
+        size_t _limit;
 
         //
         // Sort key generation