svn commit: r472002 - in branches/2018Q2/www/waterfox: . files

[Jan Beich]

Author: jbeich
Date: Fri Jun  8 14:16:30 2018
New Revision: 472002
URL: https://svnweb.freebsd.org/changeset/ports/472002

Log:
  MFH: r472001
  
  www/waterfox: restore FF61 fix after r471887
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q2/www/waterfox/Makefile
  branches/2018Q2/www/waterfox/files/patch-bug1453127
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/www/waterfox/Makefile
==============================================================================
--- branches/2018Q2/www/waterfox/Makefile	Fri Jun  8 14:10:04 2018	(r472001)
+++ branches/2018Q2/www/waterfox/Makefile	Fri Jun  8 14:16:30 2018	(r472002)
@@ -3,7 +3,7 @@
 PORTNAME=	waterfox
 DISTVERSION=	56.2.0-31
 DISTVERSIONSUFFIX=	-gf435a827f82ac
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: branches/2018Q2/www/waterfox/files/patch-bug1453127
==============================================================================
--- branches/2018Q2/www/waterfox/files/patch-bug1453127	Fri Jun  8 14:10:04 2018	(r472001)
+++ branches/2018Q2/www/waterfox/files/patch-bug1453127	Fri Jun  8 14:16:30 2018	(r472002)
@@ -1,3 +1,39 @@
+commit 7f8f5d958ed6
+Author: Bryce Van Dyk <bvandyk at mozilla.com>
+Date:   Wed Apr 18 15:30:57 2018 -0400
+
+    Bug 1453127 - Do not use iterators in MediaStreamTrack when removing listeners. r=pehrsons a=lizzard
+    
+    --HG--
+    extra : source : 6b3aaee40f7507e240da08d6e073cff3c53971f4
+---
+ dom/media/MediaStreamTrack.cpp | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git dom/media/MediaStreamTrack.cpp dom/media/MediaStreamTrack.cpp
+index 010373e9086dc..af6c6014cf02a 100644
+--- dom/media/MediaStreamTrack.cpp
++++ dom/media/MediaStreamTrack.cpp
+@@ -166,11 +166,15 @@ MediaStreamTrack::Destroy()
+     mPrincipalHandleListener->Forget();
+     mPrincipalHandleListener = nullptr;
+   }
+-  for (auto l : mTrackListeners) {
+-    RemoveListener(l);
++  // Remove all listeners -- avoid iterating over the list we're removing from
++  const nsTArray<RefPtr<MediaStreamTrackListener>> trackListeners(mTrackListeners);
++  for (auto listener : trackListeners) {
++    RemoveListener(listener);
+   }
+-  for (auto l : mDirectTrackListeners) {
+-    RemoveDirectListener(l);
++  // Do the same as above for direct listeners
++  const nsTArray<RefPtr<DirectMediaStreamTrackListener>> directTrackListeners(mDirectTrackListeners);
++  for (auto listener : directTrackListeners) {
++    RemoveDirectListener(listener);
+   }
+ }
+ 
 commit 890e77744a2a
 Author: Andreas Pehrson <pehrsons at mozilla.com>
 Date:   Tue May 29 10:13:14 2018 +0200