Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better version of last patch -- don't pin the atoms, and clean up nicely when

Browse Source 
they're finalized so as not to crash.  Bug 294893, assumed future r=brendan,
a=drivers


git-svn-id: svn://10.0.0.236/trunk@173787 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2005-05-26 17:21:29 +00:00
parent 069e3cfc99
commit 71e216d36e
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/js/src/jsxml.c
View File

@ -180,6 +180,7 @@ static void
namespace_finalize(JSContext *cx, JSObject *obj)
{
JSXMLNamespace *ns;
JSAtom *functionAtom;
ns = (JSXMLNamespace *) JS_GetPrivate(cx, obj);
if (!ns)
@ -187,6 +188,11 @@ namespace_finalize(JSContext *cx, JSObject *obj)
JS_ASSERT(ns->object == obj);
ns->object = NULL;
UNMETER(xml_stats.livenamespaceobj);
functionAtom = cx->runtime->atomState.lazy.functionNamespaceAtom;
if (functionAtom && JSVAL_TO_OBJECT(ATOM_KEY(functionAtom)) == obj) {
cx->runtime->atomState.lazy.functionNamespaceAtom = NULL;
}
}
static void
@ -392,6 +398,15 @@ qname_finalize(JSContext *cx, JSObject *obj)
UNMETER(xml_stats.liveqnameobj);
}
static void
anyname_finalize(JSContext* cx, JSObject* obj)
{
/* Make sure the next call to js_GetAnyName doesn't try to use
this object */
cx->runtime->atomState.lazy.anynameAtom = NULL;
qname_finalize(cx, obj);
}
static uint32
qname_mark(JSContext *cx, JSObject *obj, void *arg)
{
@ -458,7 +473,7 @@ JS_FRIEND_DATA(JSClass) js_AttributeNameClass = {
JS_FRIEND_DATA(JSClass) js_AnyNameClass = {
js_AnyName_str, JSCLASS_HAS_PRIVATE | JSCLASS_CONSTRUCT_PROTOTYPE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, qname_finalize,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, anyname_finalize,
NULL, NULL, NULL, NULL,
NULL, NULL, qname_mark, NULL
};
@ -7462,7 +7477,7 @@ js_GetFunctionNamespace(JSContext *cx, jsval *vp)
if (!obj)
return JS_FALSE;
atom = js_AtomizeObject(cx, obj, ATOM_PINNED);
atom = js_AtomizeObject(cx, obj, 0);
if (!atom)
return JS_FALSE;
rt->atomState.lazy.functionNamespaceAtom = atom;
@ -7650,7 +7665,7 @@ js_GetAnyName(JSContext *cx, jsval *vp)
METER(xml_stats.qnameobj);
METER(xml_stats.liveqnameobj);
atom = js_AtomizeObject(cx, obj, ATOM_PINNED);
atom = js_AtomizeObject(cx, obj, 0);
if (!atom)
return JS_FALSE;
rt->atomState.lazy.anynameAtom = atom;