Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 16:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[INFER] Check compartment when tracing TypeObject conservative roots during GC, bug 673792.

Browse Source
This commit is contained in:
Brian Hackett 2011-07-25 14:48:22 -07:00
parent 94bef39c52
commit c2526aa719
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jsgcmark.cpp
View File

@ -237,15 +237,6 @@ MarkShape(JSTracer *trc, const Shape *shape, const char *name)
Mark(trc, shape);
}
void
MarkTypeObject(JSTracer *trc, types::TypeObject *object, const char *name)
{
JS_ASSERT(trc);
JS_ASSERT(object);
JS_SET_TRACING_NAME(trc, name);
object->trace(trc, false);
}
#if JS_HAS_XML_SUPPORT
void
MarkXML(JSTracer *trc, JSXML *xml, const char *name)
@ -527,7 +518,12 @@ MarkRoot(JSTracer *trc, const Shape *thing, const char *name)
void
MarkRoot(JSTracer *trc, types::TypeObject *thing, const char *name)
{
MarkTypeObject(trc, thing, name);
JS_ASSERT(trc);
JS_ASSERT(thing);
JS_SET_TRACING_NAME(trc, name);
JSRuntime *rt = trc->context->runtime;
if (!rt->gcCurrentCompartment || thing->compartment() == rt->gcCurrentCompartment)
thing->trace(trc, false);
}
void