wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 951632 - Fix shell metadata hook to skip functions from other compartments. r=luke

Browse Source 
--HG--
extra : rebase_source : c1b5d5fdde8748890cc6179d7d0676c809c4939b
This commit is contained in:
Jan de Mooij 2014-01-09 11:07:59 +01:00
parent db12b3ec81
commit b4a6c97b08
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/builtin/TestingFunctions.cpp
View File

@ -1009,7 +1009,7 @@ ShellObjectMetadataCallback(JSContext *cx, JSObject **pmetadata)
int stackIndex = 0;
for (NonBuiltinScriptFrameIter iter(cx); !iter.done(); ++iter) {
if (iter.isFunctionFrame()) {
if (iter.isFunctionFrame() && iter.compartment() == cx->compartment()) {
if (!JS_DefinePropertyById(cx, stack, INT_TO_JSID(stackIndex), ObjectValue(*iter.callee()),
JS_PropertyStub, JS_StrictPropertyStub, 0))
{

9
js/src/jit-test/tests/basic/bug951632.js Normal file
View File

@ -0,0 +1,9 @@
setObjectMetadataCallback(true);
var g = newGlobal()
g.eval("function f(a) { return h(); }");
g.h = function () {
return [1, 2, 3];
};
var o = getObjectMetadata(g.f(5));
assertEq(o.stack.length, 1);
assertEq(o.stack[0], g.h);