SERVER-22535 Fix MigrateFromStatus::storeCurrentLocs() to not dereference invalid memoryr3.0.10

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index b5e66402208..fdcd48f0ef6 100644
--- a/src/mongo/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
@@ -570,7 +570,12 @@ public:
             }
         }
 
-        if (PlanExecutor::DEAD == state || PlanExecutor::FAILURE == state) {
+        if (PlanExecutor::DEAD == state) {
+            errmsg = "Executor error while scanning for documents belonging to chunk.";
+            return false;
+        }
+
+        if (PlanExecutor::FAILURE == state) {
             errmsg = "Executor error while scanning for documents belonging to chunk: " +
                 WorkingSetCommon::toStatusString(obj);
             return false;