From ae184d09e6229025177e4d537ab13b32d6023a82 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Fri, 28 Aug 2020 18:15:27 +0000
Subject: Issue #1587 followup - Improve resilience of AbortSignals.

---
 dom/abort/AbortSignal.cpp | 9 ++++++++-
 dom/abort/moz.build       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dom/abort/AbortSignal.cpp b/dom/abort/AbortSignal.cpp
index 20f36d2ab..7ee6c49a9 100644
--- a/dom/abort/AbortSignal.cpp
+++ b/dom/abort/AbortSignal.cpp
@@ -56,9 +56,16 @@ AbortSignal::Aborted() const
 void
 AbortSignal::Abort()
 {
-  MOZ_ASSERT(!mAborted);
+  // Re-entrancy guard
+  if (mAborted) {
+    return;
+  }
   mAborted = true;
 
+  // We might be deleted as a result of aborting a follower, so ensure we
+  // stay alive until all followers have been aborted.
+  RefPtr<AbortSignal> pinThis = this;
+
   // Let's inform the followers.
   for (uint32_t i = 0; i < mFollowers.Length(); ++i) {
     mFollowers[i]->Aborted();
diff --git a/dom/abort/moz.build b/dom/abort/moz.build
index cb48ee15f..eacc9ddc7 100644
--- a/dom/abort/moz.build
+++ b/dom/abort/moz.build
@@ -14,7 +14,7 @@ EXPORTS.mozilla.dom += [
     'AbortSignal.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AbortController.cpp',
     'AbortSignal.cpp',
 ]
-- 
cgit v1.2.3