Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix brain-damaged code from last checkin (r=mrbkap).

Browse Source
This commit is contained in:
brendan%mozilla.org 2006-04-20 01:17:06 +00:00
parent 5af0130b91
commit da86244695
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsobj.c
View File

@ -4159,14 +4159,15 @@ JSBool
js_XDRObject(JSXDRState *xdr, JSObject **objp)
{
JSContext *cx;
JSAtom *atom;
JSClass *clasp;
uint32 classId, classDef;
JSProtoKey protoKey;
jsid classKey;
JSAtom *atom;
JSObject *proto;
cx = xdr->cx;
atom = NULL;
if (xdr->mode == JSXDR_ENCODE) {
clasp = OBJ_GET_CLASS(cx, *objp);
classId = JS_XDRFindClassIdByName(xdr, clasp->name);
@ -4176,23 +4177,20 @@ js_XDRObject(JSXDRState *xdr, JSObject **objp)
protoKey = JSCLASS_CACHED_PROTO_KEY(clasp);
if (protoKey != JSProto_Null) {
classDef |= (protoKey << 1);
classKey = INT_TO_JSID(protoKey);
} else {
atom = js_Atomize(cx, clasp->name, strlen(clasp->name), 0);
if (!atom)
return JS_FALSE;
classKey = ATOM_TO_JSID(atom);
}
} else {
clasp = NULL; /* quell GCC overwarning */
classDef = 0;
classKey = 0;
}
/* XDR a flag word followed (if true) by the class name. */
if (!JS_XDRUint32(xdr, &classDef))
return JS_FALSE;
if (classDef && !js_XDRCStringAtom(xdr, &atom))
if (atom && !js_XDRCStringAtom(xdr, &atom))
return JS_FALSE;
if (!JS_XDRUint32(xdr, &classId))