From ded11c124cdaed7a2106cc6d29a0ade798189808 Mon Sep 17 00:00:00 2001 From: Jed Davis Date: Thu, 13 Jun 2019 15:40:58 +0000 Subject: [PATCH] Bug 1554244 - Tolerate multiple calls to MessageChannel::Close. r=nika Differential Revision: https://phabricator.services.mozilla.com/D34804 --HG-- extra : moz-landing-system : lando --- ipc/glue/MessageChannel.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp index 69d63c7d2102..22a038c181ed 100644 --- a/ipc/glue/MessageChannel.cpp +++ b/ipc/glue/MessageChannel.cpp @@ -2696,9 +2696,8 @@ void MessageChannel::Close() { } if (ChannelClosed == mChannelState) { - // XXX be strict about this until there's a compelling reason - // to relax - MOZ_CRASH("Close() called on closed channel!"); + // Slightly unexpected but harmless; ignore. See bug 1554244. + return; } // Notify the other side that we're about to close our socket. If we've