зеркало из https://github.com/mozilla/pjs.git
Bug 601102 - Stop building exception backtrace at compartment boundaries (r=gal)
This commit is contained in:
Родитель
ea79905533
Коммит
e0cd11d3d6
|
@ -296,6 +296,8 @@ InitExnPrivate(JSContext *cx, JSObject *exnObject, JSString *message,
|
||||||
stackDepth = 0;
|
stackDepth = 0;
|
||||||
valueCount = 0;
|
valueCount = 0;
|
||||||
for (fp = js_GetTopStackFrame(cx); fp; fp = fp->prev()) {
|
for (fp = js_GetTopStackFrame(cx); fp; fp = fp->prev()) {
|
||||||
|
if (fp->scopeChain().compartment() != cx->compartment)
|
||||||
|
break;
|
||||||
if (fp->isFunctionFrame() && !fp->isEvalFrame()) {
|
if (fp->isFunctionFrame() && !fp->isEvalFrame()) {
|
||||||
Value v = NullValue();
|
Value v = NullValue();
|
||||||
if (checkAccess &&
|
if (checkAccess &&
|
||||||
|
@ -337,6 +339,8 @@ InitExnPrivate(JSContext *cx, JSObject *exnObject, JSString *message,
|
||||||
values = GetStackTraceValueBuffer(priv);
|
values = GetStackTraceValueBuffer(priv);
|
||||||
elem = priv->stackElems;
|
elem = priv->stackElems;
|
||||||
for (fp = js_GetTopStackFrame(cx); fp != fpstop; fp = fp->prev()) {
|
for (fp = js_GetTopStackFrame(cx); fp != fpstop; fp = fp->prev()) {
|
||||||
|
if (fp->scopeChain().compartment() != cx->compartment)
|
||||||
|
break;
|
||||||
if (!fp->isFunctionFrame() || fp->isEvalFrame()) {
|
if (!fp->isFunctionFrame() || fp->isEvalFrame()) {
|
||||||
elem->funName = NULL;
|
elem->funName = NULL;
|
||||||
elem->argc = 0;
|
elem->argc = 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче