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

Allow entering a compartment with a pending exception (bug 626267, r=luke).

Browse Source
This commit is contained in:
Andreas Gal 2011-01-17 14:21:03 -08:00
parent ec712fc18c
commit ffad8e83db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jswrapper.cpp
View File

@ -348,9 +348,6 @@ AutoCompartment::enter()
if (origin != destination) {
LeaveTrace(context);
if (context->isExceptionPending())
return false;
context->compartment = destination;
JSObject *scopeChain = target->getGlobal();
JS_ASSERT(scopeChain->isNative());
@ -360,6 +357,9 @@ AutoCompartment::enter()
context->compartment = origin;
return false;
}
if (context->isExceptionPending())
context->wrapPendingException();
}
entered = true;
return true;