summaryrefslogtreecommitdiffstats
path: root/js/src/builtin
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-14 08:51:05 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-14 08:51:05 +0200
commite2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f (patch)
tree49b484a4a14ab2c8418f0e439122f26458ddcb59 /js/src/builtin
parenta7f7a2231938e49ca2521fd417be7a313045c006 (diff)
downloadUXP-e2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f.tar
UXP-e2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f.tar.gz
UXP-e2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f.tar.lz
UXP-e2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f.tar.xz
UXP-e2719e1dbf7b706cd5ec8b3ecd899d2fc063c20f.zip
Bug 1326453 - Part 3: Don't throw a TypeError when SetPrototypeOf for module namespace objects is called with null
Diffstat (limited to 'js/src/builtin')
-rw-r--r--js/src/builtin/ModuleObject.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index f7323e852..28a3329a8 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -345,6 +345,8 @@ bool
ModuleNamespaceObject::ProxyHandler::setPrototype(JSContext* cx, HandleObject proxy,
HandleObject proto, ObjectOpResult& result) const
{
+ if (!proto)
+ return result.succeed();
return result.failCantSetProto();
}