summaryrefslogtreecommitdiff
path: root/src/mongo/db/query
diff options
context:
space:
mode:
authorHari Khalsa <hkhalsa@10gen.com>2014-03-11 16:02:35 -0400
committerHari Khalsa <hkhalsa@10gen.com>2014-03-11 17:24:06 -0400
commit63ec93b3ee18c9c16f8adde07d0e8243911a7108 (patch)
tree7ba9c055de4be905b1de2c67dbfd2afc05decaec /src/mongo/db/query
parent1ff73551566e30e1a2ca786115b5824bfeff188a (diff)
downloadmongo-63ec93b3ee18c9c16f8adde07d0e8243911a7108.tar.gz
SERVER-10026 MPR needs to not possibly access a null objOut
Diffstat (limited to 'src/mongo/db/query')
-rw-r--r--src/mongo/db/query/multi_plan_runner.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/query/multi_plan_runner.cpp b/src/mongo/db/query/multi_plan_runner.cpp
index 77d056bf3e9..d55cf34066f 100644
--- a/src/mongo/db/query/multi_plan_runner.cpp
+++ b/src/mongo/db/query/multi_plan_runner.cpp
@@ -507,7 +507,7 @@ namespace mongo {
++_failureCount;
// Propage most recent seen failure to parent.
- if (PlanStage::FAILURE == state) {
+ if (PlanStage::FAILURE == state && (NULL != objOut)) {
WorkingSetCommon::getStatusMemberObject(*candidate.ws, id, objOut);
}