Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Not part of Communicator build)

Browse Source 
Fix 105721 ECMA: assigning String.prototype.indexOf to the global object


git-svn-id: svn://10.0.0.236/trunk@4308 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
norris 1998-06-23 18:16:02 +00:00
parent 3dc293a3fe
commit 0af9ed1cc1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/js/ref/jsinterp.c
View File

@ -445,6 +445,7 @@ js_Invoke(JSContext *cx, uintN argc, JSBool constructing)
minargs = nvars = 0;
} else {
funobj = JSVAL_TO_OBJECT(v);
parent = OBJ_GET_PARENT(cx, funobj);
fun = JS_GetPrivate(cx, funobj);
if (clasp != &js_ClosureClass) {
@ -478,7 +479,7 @@ have_fun:
thisp = parent;
else
parent = NULL;
}
}
}
/* Initialize a stack frame, except for thisp and scopeChain. */
@ -502,8 +503,8 @@ have_fun:
frame.exceptPending = JS_FALSE;
/* Compute the 'this' parameter and store it in frame. */
if (thisp) {
/* Some objects (e.g., With) delegate this to another object. */
if (thisp && OBJ_GET_CLASS(cx, thisp) != &js_CallClass) {
/* Some objects (e.g., With) delegate 'this' to another object. */
thisp = OBJ_THIS_OBJECT(cx, thisp);
if (!thisp) {
ok = JS_FALSE;
@ -526,7 +527,15 @@ have_fun:
*
* The alert should display "true".
*/
thisp = parent ? parent : cx->globalObject;
if (parent == NULL) {
parent = cx->globalObject;
} else {
/* walk up to find the top-level object */
JSObject *p;
thisp = parent;
while (p = OBJ_GET_PARENT(cx, thisp))
thisp = p;
}
}
frame.thisp = thisp;