Bug 612414: Set unsigned-int value to 0 instead of NULL. r=gal a=joe
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 17 Nov 2010 12:39:37 -0800
changeset 57657 6d7b682a3cc45179fbc0c2e769eb4ba4d6cac325
parent 57656 453184e9da057f6125a0b9f365920718fe686198
child 57658 1b4d00d79ae61cca9f4aa94c35a36356d325a924
push id17027
push userdholbert@mozilla.com
push dateWed, 17 Nov 2010 20:40:13 +0000
treeherdermozilla-central@6d7b682a3cc4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgal, joe
bugs612414
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 612414: Set unsigned-int value to 0 instead of NULL. r=gal a=joe
js/src/xpconnect/wrappers/XrayWrapper.cpp
--- a/js/src/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/src/xpconnect/wrappers/XrayWrapper.cpp
@@ -231,17 +231,17 @@ ResolveNativeProperty(JSContext *cx, JSO
         /* Not found */
         return true;
     }
 
     desc->obj = holder;
     desc->attrs = JSPROP_ENUMERATE;
     desc->getter = NULL;
     desc->setter = NULL;
-    desc->shortid = NULL;
+    desc->shortid = 0;
     desc->value = JSVAL_VOID;
 
     jsval fval = JSVAL_VOID;
     if (member->IsConstant()) {
         if (!member->GetConstantValue(ccx, iface, &desc->value)) {
             JS_ReportError(cx, "Failed to convert constant native property to JS value");
             return false;
         }