svn commit: r473939 - in branches/2018Q3/www/waterfox: . files

[Jan Beich]

Author: jbeich
Date: Thu Jul  5 00:24:04 2018
New Revision: 473939
URL: https://svnweb.freebsd.org/changeset/ports/473939

Log:
  MFH: r473937
  
  www/waterfox: apply some FF61 fix
  
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q3/www/waterfox/files/patch-bug1469879
     - copied unchanged from r473937, head/www/waterfox/files/patch-bug1469879
Modified:
  branches/2018Q3/www/waterfox/Makefile
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/www/waterfox/Makefile
==============================================================================
--- branches/2018Q3/www/waterfox/Makefile	Thu Jul  5 00:21:34 2018	(r473938)
+++ branches/2018Q3/www/waterfox/Makefile	Thu Jul  5 00:24:04 2018	(r473939)
@@ -3,6 +3,7 @@
 PORTNAME=	waterfox
 DISTVERSION=	56.2.1-55
 DISTVERSIONSUFFIX=	-g6395bf177f76a
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich at FreeBSD.org

Copied: branches/2018Q3/www/waterfox/files/patch-bug1469879 (from r473937, head/www/waterfox/files/patch-bug1469879)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q3/www/waterfox/files/patch-bug1469879	Thu Jul  5 00:24:04 2018	(r473939, copy of r473937, head/www/waterfox/files/patch-bug1469879)
@@ -0,0 +1,44 @@
+commit 9d9ab00e672b
+Author: Kyle Machulis <kyle at nonpolynomial.com>
+Date:   Mon Jun 25 16:59:08 2018 -0700
+
+    Bug 1469879 - Add check for closed socket on Multicast IPC parent funcs. r=baku, a=lizzard
+    
+    MozReview-Commit-ID: CaNYPtgFz87
+    
+    --HG--
+    extra : source : ca98b6f47b4e33673291a4dc2a4ebca28ce6db00
+---
+ dom/network/UDPSocketParent.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git dom/network/UDPSocketParent.cpp dom/network/UDPSocketParent.cpp
+index 5198c4be50c06..174d1e87b13e1 100644
+--- dom/network/UDPSocketParent.cpp
++++ 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))) {