SERVER-12038 PipelineD::prepareCursorSource resilient to CQ failure

Query clients should check return value of canonicalize (since e.g.
queries with $meta sort but no $meta projection should fail to
canonicalize).

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp
index ec192698007..0578f2ac5aa 100644
--- a/src/mongo/db/pipeline/pipeline_d.cpp
+++ b/src/mongo/db/pipeline/pipeline_d.cpp
@@ -203,14 +203,14 @@ namespace {
             CanonicalQuery* cq;
             // Passing an empty projection since it is faster to use documentFromBsonWithDeps.
             // This will need to change to support covering indexes (SERVER-12015).
-            uassertStatusOK(
+            Status status =
                 CanonicalQuery::canonicalize(pExpCtx->ns,
                                              queryObj,
                                              sortObj,
                                              needQueryProjection ? projection : BSONObj(),
-                                             &cq));
+                                             &cq);
             Runner* rawRunner;
-            if (getRunner(cq, &rawRunner, runnerOptions).isOK()) {
+            if (status.isOK() && getRunner(cq, &rawRunner, runnerOptions).isOK()) {
                 // success: The Runner will handle sorting for us using an index.
                 runner.reset(rawRunner);
                 sortInRunner = true;