Bug 1878098 - Properly oom check test serialization log allocation r=…

…spidermonkey-reviewers,mgaudet Differential Revision: https://phabricator.services.mozilla.com/D202269
dothq · Feb 21, 2024 · 9b01a71 · 9b01a71
1 parent 70b547d
commit 9b01a71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
@@ -5264,15 +5264,17 @@ class CustomSerializableObject : public NativeObject {
     static ActivityLog* getThreadLog() {
       if (!self.initialized() || !self.get()) {
         self.infallibleInit();
+        AutoEnterOOMUnsafeRegion oomUnsafe;
         self.set(js_new<ActivityLog>());
-        MOZ_RELEASE_ASSERT(self.get());
+        if (!self.get()) {
+          oomUnsafe.crash("allocating activity log");
+        }
         if (!TlsContext.get()->runtime()->atExit(
                 [](void* vpData) {
                   auto* log = static_cast<ActivityLog*>(vpData);
                   js_delete(log);
                 },
                 self.get())) {
-          AutoEnterOOMUnsafeRegion oomUnsafe;
           oomUnsafe.crash("atExit");
         }
       }

diff --git a/js/src/jit-test/tests/bug1878098-serialization-log-oom.js b/js/src/jit-test/tests/bug1878098-serialization-log-oom.js
@@ -0,0 +1,6 @@
+x = [];
+x.keepFailing = [];
+oomTest(function () {
+  y = { z: [] };
+  makeSerializable().log;
+}, x);