Targeted fix for reproduction script for SERVER-38601

The patch for SERVER-35455 did not apply cleanly to this branch so
instead we pursued this more targeted fix for the leak described in
SERVER-38601.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/db/query/planner_access.cpp b/src/mongo/db/query/planner_access.cpp
index 90c4873ffbb..7be731c0ff9 100644
--- a/src/mongo/db/query/planner_access.cpp
+++ b/src/mongo/db/query/planner_access.cpp
@@ -723,6 +723,7 @@ bool QueryPlannerAccess::processIndexScans(const CanonicalQuery& query,
                                            const std::vector<IndexEntry>& indices,
                                            const QueryPlannerParams& params,
                                            std::vector<QuerySolutionNode*>* out) {
+    invariant(out->empty());
     // Initialize the ScanBuildingState.
     ScanBuildingState scanState(root, inArrayOperator, indices);
 
@@ -750,6 +751,9 @@ bool QueryPlannerAccess::processIndexScans(const CanonicalQuery& query,
             // In most cases this means that we recursively build indexed data
             // access on 'child'.
             if (!processIndexScansSubnode(query, &scanState, params, out)) {
+                for (auto& soln : *out) {
+                    delete soln;  // Clean up any partial solutions.
+                }
                 return false;
             }
             continue;