nulling out struct members to fix null pointer exception

jbarnette · Apr 19, 2008 · f07f892 · f07f892
1 parent 23aa72e
commit f07f892
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ext/spidermonkey/context.c b/ext/spidermonkey/context.c
@@ -72,6 +72,9 @@ static void deallocate(OurContext* context)
   assert(JS_RemoveRoot(context->js, &(context->gcthings)));
   JS_HashTableDestroy(context->rbids);
   JS_HashTableDestroy(context->jsids);
+
+  context->jsids = 0;
+  context->rbids = 0;
 
   JS_DestroyContext(context->js);
   JS_DestroyRuntime(context->runtime);

diff --git a/ext/spidermonkey/ruby_land_proxy.c b/ext/spidermonkey/ruby_land_proxy.c
@@ -247,7 +247,7 @@ call_function_property(int argc, VALUE* argv, VALUE self)
 static void finalize(RubyLandProxy* proxy)
 {
   // could get finalized after the context has been freed
-  if (proxy->context)
+  if (proxy->context && proxy->context->jsids)
   {
     // remove this proxy from the OID map
     JS_HashTableRemove(proxy->context->jsids, (void *)proxy->value);