зеркало из https://github.com/mozilla/pjs.git
Defend against [[DefaultValue]] divergence (295666, r=shaver).
This commit is contained in:
Родитель
39105c7c03
Коммит
dd6effa86a
|
@ -1083,8 +1083,9 @@ js_ReportUncaughtException(JSContext *cx)
|
|||
reportp = NULL;
|
||||
#endif
|
||||
|
||||
/* XXX L10N angels cry once again (see also jsemit.c, /L10N gaffes/) */
|
||||
str = js_ValueToString(cx, exn);
|
||||
bytes = str ? js_GetStringBytes(str) : "null";
|
||||
bytes = str ? js_GetStringBytes(str) : "unknown (can't convert to string)";
|
||||
ok = JS_TRUE;
|
||||
|
||||
if (!reportp &&
|
||||
|
|
|
@ -3825,6 +3825,12 @@ js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
|
|||
JSErrorReporter older;
|
||||
jsval fval;
|
||||
JSBool ok;
|
||||
int stackDummy;
|
||||
|
||||
if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
|
||||
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
|
||||
return JS_FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Report failure only if an appropriate method was found, and calling it
|
||||
|
|
Загрузка…
Ссылка в новой задаче