Merge mozilla-central to tracemonkey.

2009-08-12 12:18:38 -07:00
parent 559c380a87 5a96b9f915
commit c5c03d7dd3
891 changed files with 24089 additions and 49450 deletions
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -4166,8 +4166,6 @@ PutProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
                    goto bad;
            } else {
                nameobj = targetprop;
-                if (!nameobj)
-                    goto bad;
                if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
                    /*
                     * 2(c)(iii)(1-3).