Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 642022 - Deal with the return value being in a different compartment. r=gal

Browse Source 
--HG--
extra : rebase_source : b924c99e830cdafd7e1471cf087e69cfc7e33e23
This commit is contained in:
Blake Kaplan 2011-04-08 14:28:24 -07:00
parent 626b51b07f
commit 14fc761f75
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/crashtests/642022-1.html Normal file
View File

@ -0,0 +1,4 @@
<!DOCTYPE html>
<script>
InstallTrigger.constructor.create(window).setTimeout(Array, 0);
</script>

1
content/base/crashtests/crashtests.list
View File

@ -86,5 +86,6 @@ load 593302-2.html
load 610571-1.html
load 604262-1.html
load 628599-1.html
load 642022-1.html
load 637214-1.svg
load 637214-2.svg

12
dom/base/nsJSEnvironment.cpp
View File

@ -1925,10 +1925,16 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler
// Convert to variant before calling ScriptEvaluated, as it may GC, meaning
// we would need to root rval.
if (NS_SUCCEEDED(rv)) {
if (rval == JSVAL_NULL)
if (rval == JSVAL_NULL) {
*arv = nsnull;
else
rv = nsContentUtils::XPConnect()->JSToVariant(mContext, rval, arv);
} else {
if (!JS_WrapValue(mContext, &rval)) {
ReportPendingException();
rv = NS_ERROR_FAILURE;
} else {
rv = nsContentUtils::XPConnect()->JSToVariant(mContext, rval, arv);
}
}
}
// ScriptEvaluated needs to come after we pop the stack