Merge commit 'upstream/1.8.3'

1 files changed, 8 insertions, 1 deletions

diff --git a/db/geo/2d.cpp b/db/geo/2d.cpp
index d6c97f6..7b2bf17 100644
--- a/db/geo/2d.cpp
+++ b/db/geo/2d.cpp
@@ -1125,7 +1125,14 @@ namespace mongo {
         virtual Record* _current() { assert(ok()); return _cur->_loc.rec(); }
         virtual BSONObj current() { assert(ok()); return _cur->_o; }
         virtual DiskLoc currLoc() { assert(ok()); return _cur->_loc; }
-        virtual bool advance() { _cur++; incNscanned(); return ok(); }
+        virtual bool advance() {
+            if( ok() ){
+                _cur++;
+                incNscanned();
+                return ok();
+            }
+            return false;
+        }
         virtual BSONObj currKey() const { return _cur->_key; }
 
         virtual string toString() {