SERVER-13293 fixed geo filter memory leak when creating index scan/fetch stages

(cherry picked from commit b03ec74111f0dc839d14bacf3f12267133cbc935)

2 files changed, 9 insertions, 3 deletions

diff --git a/src/mongo/db/exec/s2near.cpp b/src/mongo/db/exec/s2near.cpp
index 74d0582ce39..55b6274f2d6 100644
--- a/src/mongo/db/exec/s2near.cpp
+++ b/src/mongo/db/exec/s2near.cpp
@@ -274,9 +274,11 @@ namespace mongo {
         //
         // This does force us to do our own deduping of results, though.
         params.doNotDedup = true;
-        GeoS2KeyMatchExpression* me = new GeoS2KeyMatchExpression(
-            &_annulus, _params.baseBounds.fields[_nearFieldIndex].name);
-        IndexScan* scan = new IndexScan(params, _ws, me);
+
+        // Owns geo filter.
+        _keyGeoFilter.reset(new GeoS2KeyMatchExpression(
+            &_annulus, _params.baseBounds.fields[_nearFieldIndex].name));
+        IndexScan* scan = new IndexScan(params, _ws, _keyGeoFilter.get());
 
         // Owns 'scan'.
         _child.reset(new FetchStage(_ws, scan, _params.filter));
@@ -289,6 +291,7 @@ namespace mongo {
         // All done reading from _child.
         if (PlanStage::IS_EOF == state) {
             _child.reset();
+            _keyGeoFilter.reset();
 
             // Adjust the annulus size depending on how many results we got.
             if (_results.empty()) {
diff --git a/src/mongo/db/exec/s2near.h b/src/mongo/db/exec/s2near.h
index 4c84d547253..054b4cce16f 100644
--- a/src/mongo/db/exec/s2near.h
+++ b/src/mongo/db/exec/s2near.h
@@ -91,6 +91,9 @@ namespace mongo {
         // bounds for the various annuluses/annuli.
         int _nearFieldIndex;
 
+        // Geo filter in index scan (which is owned by fetch stage in _child).
+        scoped_ptr<MatchExpression> _keyGeoFilter;
+
         scoped_ptr<PlanStage> _child;
 
         // The S2 machinery that represents the search annulus.  We keep this around after bounds