Create release branch COMM_20090715_RELBRANCH for Thunderbird 3 Beta 3. r=gozer, a=dmose CLOSED TREE COMM_20090715_RELBRANCH THUNDERBIRD_3_0b3_BUILD1 THUNDERBIRD_3_0b3_RELEASE
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Wed, 15 Jul 2009 15:40:35 -0400
branchCOMM_20090715_RELBRANCH
changeset 26070 d65293fb4bbb53e1982a7ab108592607d036609e
parent 26067 a97db942191c8d2a7830fd390042fbeb99e6674b
child 26071 6550fd75efa5f80c86605e68fe6d4883bb41635d
push id1775
push usergozer@mozillamessaging.com
push dateWed, 15 Jul 2009 19:41:10 +0000
reviewersgozer, dmose
bugs497355
milestone1.9.1.1
Create release branch COMM_20090715_RELBRANCH for Thunderbird 3 Beta 3. r=gozer, a=dmose CLOSED TREE Land asuth's JS patch from bug 497355 on mozilla-central relbranch a=dmose
js/src/jsobj.cpp
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2662,17 +2662,18 @@ js_XDRBlockObject(JSXDRState *xdr, JSObj
             !JS_XDRUint16(xdr, (uint16 *)&shortid)) {
             ok = JS_FALSE;
             break;
         }
 
         if (xdr->mode == JSXDR_DECODE) {
             if (!js_DefineNativeProperty(cx, obj, ATOM_TO_JSID(atom),
                                          JSVAL_VOID, NULL, NULL,
-                                         JSPROP_ENUMERATE | JSPROP_PERMANENT,
+                                         JSPROP_ENUMERATE | JSPROP_PERMANENT |
+                                         JSPROP_SHARED,
                                          SPROP_HAS_SHORTID, shortid, NULL)) {
                 ok = JS_FALSE;
                 break;
             }
         }
     }
 
     JS_POP_TEMP_ROOT(cx, &tvr);