diff options
| author | Qingyang Chen <qingyang.chen@10gen.com> | 2015-08-03 18:28:00 -0400 |
|---|---|---|
| committer | Qingyang Chen <qingyang.chen@10gen.com> | 2015-08-04 13:56:18 -0400 |
| commit | cfe4562fb64b756ed4fe7389f924b52cf8595f9f (patch) | |
| tree | 9d36c78a39d946b476331bf1d1a4370f657ea589 /src/mongo/db | |
| parent | 6ba08bc5bdcd4f41899a0fc7c8a60cbc3aed1102 (diff) | |
| download | mongo-cfe4562fb64b756ed4fe7389f924b52cf8595f9f.tar.gz | |
SERVER-19725 Fix nullptr crash in QueryPlanner::plan with $near operator
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/query/query_planner.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/query/query_planner_geo_test.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp index 8cffd85bd5c..e027e00c086 100644 --- a/src/mongo/db/query/query_planner.cpp +++ b/src/mongo/db/query/query_planner.cpp @@ -666,7 +666,7 @@ Status QueryPlanner::plan(const CanonicalQuery& query, if (QueryPlannerCommon::hasNode(query.root(), MatchExpression::GEO_NEAR, &gnNode)) { // No index for GEO_NEAR? No query. RelevantTag* tag = static_cast<RelevantTag*>(gnNode->getTag()); - if (0 == tag->first.size() && 0 == tag->notFirst.size()) { + if (!tag || (0 == tag->first.size() && 0 == tag->notFirst.size())) { LOG(5) << "Unable to find index for $geoNear query." << endl; // Don't leave tags on query tree. query.root()->resetTag(); diff --git a/src/mongo/db/query/query_planner_geo_test.cpp b/src/mongo/db/query/query_planner_geo_test.cpp index 7129f01af73..8d64689960b 100644 --- a/src/mongo/db/query/query_planner_geo_test.cpp +++ b/src/mongo/db/query/query_planner_geo_test.cpp @@ -227,6 +227,12 @@ TEST_F(QueryPlannerTest, NearNoIndex) { runInvalidQuery(fromjson("{x:1, a: {$nearSphere: [0,0], $maxDistance: 0.31 }}")); } +TEST_F(QueryPlannerTest, NearEmptyPath) { + addIndex(BSON("" + << "2dsphere")); + runInvalidQuery(fromjson("{'': {$near: {$geometry: {type: 'Point', coordinates: [0, 0]}}}}")); +} + TEST_F(QueryPlannerTest, TwoDSphereNoGeoPred) { addIndex(BSON("x" << 1 << "a" << "2dsphere")); |