Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix watchpoint pseudo-frame to have non-null pc field (361360, r=mrbkap).

Browse Source
This commit is contained in:
brendan%mozilla.org 2006-11-21 21:23:18 +00:00
parent 83dc259f17
commit 3658c8aaf3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsdbgapi.c
View File

@ -1,4 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sw=4 et tw=78:
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -360,9 +361,11 @@ js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
vp, wp->closure);
if (ok) {
/*
* Create pseudo-frame for call to setter so that any
* stack-walking security code in the setter will correctly
* identify the guilty party.
* Create a pseudo-frame for the setter invocation so that any
* stack-walking security code under the setter will correctly
* identify the guilty party. So that the watcher appears to
* be active to obj_eval and other such code, point frame.pc
* at the JSOP_STOP at the end of the function's script.
*/
JSObject *funobj = (JSObject *) wp->closure;
JSFunction *fun = (JSFunction *) JS_GetPrivate(cx, funobj);
@ -376,6 +379,9 @@ js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
frame.script = FUN_SCRIPT(fun);
frame.fun = fun;
frame.down = cx->fp;
JS_ASSERT(frame.script->length >= JSOP_STOP_LENGTH);
frame.pc = frame.script->code + frame.script->length
- JSOP_STOP_LENGTH;
frame.argv = argv + 2;
cx->fp = &frame;
ok = !wp->setter ||