summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2013-12-09 10:57:19 -0500
committermatt dannenberg <matt.dannenberg@10gen.com>2013-12-09 14:37:37 -0500
commit9c9bbd9eeb0978023c599e714d33e004fa94b5c8 (patch)
tree654b0fe036218173eeb79801fa62f19bbb9b87e0
parentbe66f1b8fc992251f4785adb4c632d3b4677e005 (diff)
downloadmongo-9c9bbd9eeb0978023c599e714d33e004fa94b5c8.tar.gz
SERVER-10538 SERVER-11731 change segfault to uassert on improper use of $where
-rw-r--r--src/mongo/db/matcher.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/db/matcher.cpp b/src/mongo/db/matcher.cpp
index eda29b48163..8597ab2083f 100644
--- a/src/mongo/db/matcher.cpp
+++ b/src/mongo/db/matcher.cpp
@@ -465,6 +465,8 @@ namespace mongo {
uassert( 10066 , "$where may only appear once in query", _where == 0 );
uassert( 10067 , "$where query, but no script engine", globalScriptEngine );
massert( 13089 , "no current client needed for $where" , haveClient() );
+ uassert( 17126 , "no valid context found for $where", cc().getContext());
+
_where = new Where( cc().ns() );
if ( e.type() == CodeWScope ) {