@@ -155,6 +155,7 @@ initialize_native(VALUE self, VALUE UNUSED(options))
JohnsonRuntime* runtime;
Data_Get_Struct(self, JohnsonRuntime, runtime);
+ bool global_rooted_p = false;
bool gcthings_rooted_p = false;
if ((runtime->js = JS_NewRuntime(0x100000))
@@ -166,11 +167,14 @@ initialize_native(VALUE self, VALUE UNUSED(options))
JSContext* context = johnson_get_current_context(runtime);
if(
(runtime->gcthings = JS_NewObject(context, NULL, 0, 0))
+ &&(gcthings_rooted_p = JS_AddNamedRoot(context, &(runtime->gcthings), "runtime->gcthings"))
&&(runtime->global = JS_GetGlobalObject(context))
- &&(gcthings_rooted_p = JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
+ &&(global_rooted_p = JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
) {
return self;
}
+ if (global_rooted_p)
+ JS_RemoveRoot(context, &(runtime->global));
if (gcthings_rooted_p)
JS_RemoveRoot(context, &(runtime->gcthings));
}
ext/spidermonkey/runtime.c
947c557bb8b54f75e236c09209492dce5d650b36
Matthew Draper
matthew@trebex.net
http://github.com/jbarnette/johnson/commit/dc9c9cb4769a1acb15be6c089dd324e24fa75584
dc9c9cb4769a1acb15be6c089dd324e24fa75584
2008-05-31T19:58:41-07:00
2008-05-31T19:51:22-07:00
Root both gcthings and global.
855e38e6665d51257e846be7ce697d4f045ab9b5
Matthew Draper
matthew@trebex.net