nullptr is not a boolean.

2 files changed, 135 insertions, 1 deletions

diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 950fa981ee5..db89e4afe54 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2014/06/28 22:51:38 joerg Exp $
+$NetBSD: distinfo,v 1.114 2014/10/17 16:50:11 joerg Exp $
 
 SHA1 (enigmail-1.6.1_pre20140112.tar.xz) = abb4ce7a5512095c18af7e68f4cbeb52b1e95179
 RMD160 (enigmail-1.6.1_pre20140112.tar.xz) = 617cf51d64458b9e1df332e3759cddd2b2bb34df
@@ -95,6 +95,7 @@ SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 0a58209ce22b7678c003c2
 SHA1 (patch-mozilla_ipc_glue_ScopedXREEmbed.cpp) = b6c4bbe2df7149b7d562a85e6bab6149b4a4a661
 SHA1 (patch-mozilla_ipc_glue_StringUtil.cpp) = ff0b3914baef8505b40f68c625ee62650f026f06
 SHA1 (patch-mozilla_js_src_Makefile.in) = 7898c6d201be5bf02bf09b4f6e8018ad8920b505
+SHA1 (patch-mozilla_js_src_builtin_TypedObject.cpp) = 523713078befb87f8342e08b543adb9337d308ea
 SHA1 (patch-mozilla_js_src_ctypes_CTypes.h) = 37ef9e49c21199d8506e7c0c048a7651800a249a
 SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = af9c153c78a3d50e926f7820db3c98b7fe1db063
 SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = edf428e3537e98572a3023f4d5c2cf324a4a4de7
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_builtin_TypedObject.cpp b/www/seamonkey/patches/patch-mozilla_js_src_builtin_TypedObject.cpp
new file mode 100644
index 00000000000..fb0a615439b
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_js_src_builtin_TypedObject.cpp
@@ -0,0 +1,133 @@
+$NetBSD: patch-mozilla_js_src_builtin_TypedObject.cpp,v 1.1 2014/10/17 16:50:11 joerg Exp $
+
+--- mozilla/js/src/builtin/TypedObject.cpp.orig	2014-06-13 00:46:08.000000000 +0000
++++ mozilla/js/src/builtin/TypedObject.cpp
+@@ -753,7 +753,7 @@ ArrayType::construct(JSContext *cx, unsi
+     // Extract ArrayType.prototype
+     RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal));
+     if (!arrayTypePrototype)
+-        return nullptr;
++        return false;
+ 
+     // Create the instance of ArrayType
+     RootedObject obj(
+@@ -766,7 +766,7 @@ ArrayType::construct(JSContext *cx, unsi
+     if (!JSObject::defineProperty(cx, obj, cx->names().length,
+                                   lengthVal, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     args.rval().setObject(*obj);
+     return true;
+@@ -814,7 +814,7 @@ ArrayType::dimension(JSContext *cx, unsi
+     if (!JSObject::defineProperty(cx, obj, cx->names().length,
+                                   lengthVal, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     // Add `unsized` property, which is a link from the sized
+     // array to the unsized array.
+@@ -822,7 +822,7 @@ ArrayType::dimension(JSContext *cx, unsi
+     if (!JSObject::defineProperty(cx, obj, cx->names().unsized,
+                                   unsizedTypeObjValue, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     args.rval().setObject(*obj);
+     return true;
+@@ -1244,14 +1244,14 @@ GlobalObject::initTypedObjectModule(JSCo
+ #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_)                       \
+     if (!DefineSimpleTypeObject<ScalarType>(cx, global, module, constant_,      \
+                                             cx->names().name_))                 \
+-        return nullptr;
++        return false;
+     JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
+ #undef BINARYDATA_SCALAR_DEFINE
+ 
+ #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_)                    \
+     if (!DefineSimpleTypeObject<ReferenceType>(cx, global, module, constant_,   \
+                                                cx->names().name_))              \
+-        return nullptr;
++        return false;
+     JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
+ #undef BINARYDATA_REFERENCE_DEFINE
+ 
+@@ -1261,14 +1261,14 @@ GlobalObject::initTypedObjectModule(JSCo
+     arrayType = DefineMetaTypeObject<ArrayType>(
+         cx, global, module, TypedObjectModuleObject::ArrayTypePrototype);
+     if (!arrayType)
+-        return nullptr;
++        return false;
+ 
+     RootedValue arrayTypeValue(cx, ObjectValue(*arrayType));
+     if (!JSObject::defineProperty(cx, module, cx->names().ArrayType,
+                                   arrayTypeValue,
+                                   nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     // StructType.
+ 
+@@ -1276,23 +1276,23 @@ GlobalObject::initTypedObjectModule(JSCo
+     structType = DefineMetaTypeObject<StructType>(
+         cx, global, module, TypedObjectModuleObject::StructTypePrototype);
+     if (!structType)
+-        return nullptr;
++        return false;
+ 
+     RootedValue structTypeValue(cx, ObjectValue(*structType));
+     if (!JSObject::defineProperty(cx, module, cx->names().StructType,
+                                   structTypeValue,
+                                   nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     //  Handle
+ 
+     RootedObject handle(cx, NewBuiltinClassInstance(cx, &JSObject::class_));
+     if (!module)
+-        return nullptr;
++        return false;
+ 
+     if (!JS_DefineFunctions(cx, handle, TypedHandle::handleStaticMethods))
+-        return nullptr;
++        return false;
+ 
+     RootedValue handleValue(cx, ObjectValue(*handle));
+     if (!JSObject::defineProperty(cx, module, cx->names().Handle,
+@@ -1300,7 +1300,7 @@ GlobalObject::initTypedObjectModule(JSCo
+                                   nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+     {
+-        return nullptr;
++        return false;
+     }
+ 
+     // Everything is setup, install module on the global object:
+@@ -1311,10 +1311,10 @@ GlobalObject::initTypedObjectModule(JSCo
+                                   nullptr, nullptr,
+                                   0))
+     {
+-        return nullptr;
++        return false;
+     }
+ 
+-    return module;
++    return module != nullptr;
+ }
+ 
+ JSObject *
+@@ -2404,7 +2404,7 @@ TypedObject::construct(JSContext *cx, un
+     // Create zeroed wrapper object.
+     Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length));
+     if (!obj)
+-        return nullptr;
++        return false;
+ 
+     if (nextArg < argc) {
+         RootedValue initial(cx, args[nextArg++]);