From 0f901b5c3135a28814712131f893b994bd657b9e Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Mon, 25 Jun 2018 16:59:08 -0700
Subject: [PATCH] Bug 1469879 - Add check for closed socket on Multicast IPC
 parent funcs; r=baku

MozReview-Commit-ID: CaNYPtgFz87

--HG--
extra : rebase_source : a4043a24a8954e2cb5a63211d4cbc1f08930a2fb
---
 dom/network/UDPSocketParent.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dom/network/UDPSocketParent.cpp b/dom/network/UDPSocketParent.cpp
index 5198c4be50c0..174d1e87b13e 100644
--- a/dom/network/UDPSocketParent.cpp
+++ b/dom/network/UDPSocketParent.cpp
@@ -450,6 +450,12 @@ mozilla::ipc::IPCResult
 UDPSocketParent::RecvJoinMulticast(const nsCString& aMulticastAddress,
                                    const nsCString& aInterface)
 {
+  if (!mSocket) {
+    NS_WARNING("multicast socket is closed");
+    FireInternalError(__LINE__);
+    return IPC_OK();
+  }
+
   nsresult rv = mSocket->JoinMulticast(aMulticastAddress, aInterface);
 
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -463,6 +469,12 @@ mozilla::ipc::IPCResult
 UDPSocketParent::RecvLeaveMulticast(const nsCString& aMulticastAddress,
                                     const nsCString& aInterface)
 {
+  if (!mSocket) {
+    NS_WARNING("multicast socket is closed");
+    FireInternalError(__LINE__);
+    return IPC_OK();
+  }
+
   nsresult rv = mSocket->LeaveMulticast(aMulticastAddress, aInterface);
 
   if (NS_WARN_IF(NS_FAILED(rv))) {