more safety for getMore yielding 180

2 files changed, 11 insertions, 1 deletions

diff --git a/db/clientcursor.h b/db/clientcursor.h
index c585bb25663..f1d107fb6d9 100644
--- a/db/clientcursor.h
+++ b/db/clientcursor.h
@@ -91,6 +91,13 @@ namespace mongo {
                     _c = 0;
                 }
             }
+            /**
+             * call this if during a yield, the cursor got deleted
+             * if so, we don't want to use the point address
+             */
+            void deleted() {
+                _c = 0;
+            }
             ~Pointer() { release(); }
             Pointer(long long cursorid) {
                 recursive_scoped_lock lock(ccmutex);
diff --git a/db/query.cpp b/db/query.cpp
index 7d006aba910..df09fcec51c 100644
--- a/db/query.cpp
+++ b/db/query.cpp
@@ -382,11 +382,14 @@ namespace mongo {
                 c->advance();
 
                 if ( ! cc->yieldSometimes() ) {
+                    ClientCursor::erase(cursorid);
+                    cursorid = 0;
                     cc = 0;
+                    p.deleted();
                     break;
                 }
             }
-
+            
             if ( cc ) {
                 cc->updateLocation();
                 cc->mayUpgradeStorage();