diff options
author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-03-07 17:20:22 -0500 |
---|---|---|
committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-03-07 17:20:22 -0500 |
commit | 1e0512f8453d103987f5fbfb87b71e9a131c2a60 (patch) | |
tree | 906b605c2b3b90986cfe0a3e302d4168dba18441 | |
parent | c62a2810e54ed4ac7b98c75896b614d3ff3eb619 (diff) | |
download | mongo-1e0512f8453d103987f5fbfb87b71e9a131c2a60.tar.gz |
SERVER-22535 Fix MigrateFromStatus::storeCurrentLocs() to not dereference invalid memoryr3.0.10
-rw-r--r-- | src/mongo/s/d_migrate.cpp | 7 |
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; |