summaryrefslogtreecommitdiff
path: root/src/mongo/scripting/mozjs/db.cpp
diff options
context:
space:
mode:
authorJason Carey <jcarey@argv.me>2015-09-14 16:19:11 -0400
committerJason Carey <jcarey@argv.me>2015-09-17 20:13:11 -0400
commit041e4fe737342bf40a6aedb7a04d8d99ba20e213 (patch)
tree148c21a538fd93bddf8a1982d463400d73984060 /src/mongo/scripting/mozjs/db.cpp
parent8291bbb3a6ec192d177076b1fb0cd28995e48440 (diff)
downloadmongo-041e4fe737342bf40a6aedb7a04d8d99ba20e213.tar.gz
SERVER-20375 Constrain JS method thisv
This constrains universal access to wraptype methods by providing a JS_ATTACH_JS_CONSTRAINED_METHOD() macro which allows for a list of types that are allowed to call said method. In this way we can lock down all methods without having to add uasserts to each individual method body.
Diffstat (limited to 'src/mongo/scripting/mozjs/db.cpp')
-rw-r--r--src/mongo/scripting/mozjs/db.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/scripting/mozjs/db.cpp b/src/mongo/scripting/mozjs/db.cpp
index 851d6f3e49f..9a5d45b0984 100644
--- a/src/mongo/scripting/mozjs/db.cpp
+++ b/src/mongo/scripting/mozjs/db.cpp
@@ -100,7 +100,7 @@ void DBInfo::getProperty(JSContext* cx,
uassert(16861,
"getCollection returned something other than a collection",
- scope->getDbCollectionProto().instanceOf(coll));
+ scope->getProto<DBCollectionInfo>().instanceOf(coll));
// cache collection for reuse, don't enumerate
ObjectWrapper(cx, obj).defineProperty(sname.c_str(), coll, 0);
@@ -121,7 +121,7 @@ void DBInfo::construct(JSContext* cx, JS::CallArgs args) {
}
JS::RootedObject thisv(cx);
- scope->getDbProto().newObject(&thisv);
+ scope->getProto<DBInfo>().newObject(&thisv);
ObjectWrapper o(cx, thisv);
o.setValue("_mongo", args.get(0));