summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-09-20 11:40:10 -0400
committerColin Walters <walters@verbum.org>2010-09-20 11:40:10 -0400
commitbd8023346a158f11aa1a8620ae63eb8ec08a06bc (patch)
tree8d3bc23ee1dd0ed4d0b6fd436bada23d73fd9eb6
parentd746313f62faa73fa827572361a1cb9d22b59623 (diff)
downloadgjs-wip/xulrunner-1.9.3-rebase2.tar.gz
[SQUASH] fix up rooting of debuggerwip/xulrunner-1.9.3-rebase2
-rw-r--r--modules/debugger.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/debugger.c b/modules/debugger.c
index 592978ee..b7dc6a61 100644
--- a/modules/debugger.c
+++ b/modules/debugger.c
@@ -75,6 +75,12 @@ gjs_debugger_debug_error_hook(JSContext *context,
exc = JSVAL_NULL;
}
+ for (i = 0; i < 7; i++) {
+ argv[i] = JSVAL_NULL;
+ JS_AddValueRoot(context, &argv[i]);
+ }
+ JS_AddValueRoot(context, &retval);
+
str = JS_NewStringCopyZ(context, message);
if (!str)
goto out;
@@ -93,10 +99,6 @@ gjs_debugger_debug_error_hook(JSContext *context,
goto out;
argv[6] = exc;
- for (i = 0; i < 7; i++)
- JS_AddValueRoot(context, &argv[i]);
- JS_AddValueRoot(context, &retval);
-
gjs_closure_invoke(closure, 7, argv, &retval);
out: