From owner-svn-ports-all@freebsd.org Mon May 28 23:54:01 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C1C6F6E048; Mon, 28 May 2018 23:54:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1164A6B017; Mon, 28 May 2018 23:54:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6E2A1447D; Mon, 28 May 2018 23:54:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4SNs06c021913; Mon, 28 May 2018 23:54:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4SNrxWH021904; Mon, 28 May 2018 23:53:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805282353.w4SNrxWH021904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 28 May 2018 23:53:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471070 - in head/www/waterfox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/waterfox: . files X-SVN-Commit-Revision: 471070 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2018 23:54:01 -0000 Author: jbeich Date: Mon May 28 23:53:59 2018 New Revision: 471070 URL: https://svnweb.freebsd.org/changeset/ports/471070 Log: www/waterfox: update to 56.2.0.19 - Apply some FF61 fixes Changes: https://github.com/MrAlex94/Waterfox/compare/d2cdd42f4115b...01e6727879b2a Added: head/www/waterfox/files/patch-bug1425930 (contents, props changed) head/www/waterfox/files/patch-bug1439236 (contents, props changed) head/www/waterfox/files/patch-bug1463494 (contents, props changed) Modified: head/www/waterfox/Makefile (contents, props changed) head/www/waterfox/distinfo (contents, props changed) Modified: head/www/waterfox/Makefile ============================================================================== --- head/www/waterfox/Makefile Mon May 28 23:48:03 2018 (r471069) +++ head/www/waterfox/Makefile Mon May 28 23:53:59 2018 (r471070) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.2.0-13 -DISTVERSIONSUFFIX= -gd2cdd42f4115b -PORTREVISION= 5 +DISTVERSION= 56.2.0-19 +DISTVERSIONSUFFIX= -g01e6727879b2a CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: head/www/waterfox/distinfo ============================================================================== --- head/www/waterfox/distinfo Mon May 28 23:48:03 2018 (r471069) +++ head/www/waterfox/distinfo Mon May 28 23:53:59 2018 (r471070) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526579170 -SHA256 (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 3722c20ec52309b1b184e0c82d15ebd2bf0d793c3306099028f789415256c6ca -SIZE (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 395161904 +TIMESTAMP = 1527436132 +SHA256 (MrAlex94-Waterfox-56.2.0-19-g01e6727879b2a_GH0.tar.gz) = 18a5714a9fe899e1939170a744d27e4ca8092ca4ef53054f1d26e0b7d6b0e483 +SIZE (MrAlex94-Waterfox-56.2.0-19-g01e6727879b2a_GH0.tar.gz) = 395151801 Added: head/www/waterfox/files/patch-bug1425930 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1425930 Mon May 28 23:53:59 2018 (r471070) @@ -0,0 +1,66 @@ +commit dc0965023fb7 +Author: Randell Jesup +Date: Mon May 21 15:30:35 2018 -0400 + + Bug 1425930 - Handle Broadcast()->Notify() calling RemoveObserver(). r=froydnj, a=abillings + + --HG-- + extra : source : a314710b0acd38afc7de74f0306f514b50d84463 +--- + xpcom/ds/Observer.h | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +diff --git xpcom/ds/Observer.h xpcom/ds/Observer.h +index 958e5e4a9694e..83d650a936ccc 100644 +--- xpcom/ds/Observer.h ++++ xpcom/ds/Observer.h +@@ -57,7 +57,17 @@ public: + */ + bool RemoveObserver(Observer* aObserver) + { +- return mObservers.RemoveElement(aObserver); ++ if (mObservers.RemoveElement(aObserver)) { ++ if (!mBroadcastCopy.IsEmpty()) { ++ // Annoyingly, someone could RemoveObserver() an item on the list ++ // while we're in a Broadcast()'s Notify() call. ++ auto i = mBroadcastCopy.IndexOf(aObserver); ++ MOZ_ASSERT(i != mBroadcastCopy.NoIndex); ++ mBroadcastCopy[i] = nullptr; ++ } ++ return true; ++ } ++ return false; + } + + uint32_t Length() +@@ -65,17 +75,27 @@ public: + return mObservers.Length(); + } + ++ /** ++ * Call Notify() on each item in the list. ++ * Handles the case of Notify() calling RemoveObserver() ++ */ + void Broadcast(const T& aParam) + { +- nsTArray*> observersCopy(mObservers); +- uint32_t size = observersCopy.Length(); ++ MOZ_ASSERT(mBroadcastCopy.IsEmpty()); ++ mBroadcastCopy = mObservers; ++ uint32_t size = mBroadcastCopy.Length(); + for (uint32_t i = 0; i < size; ++i) { +- observersCopy[i]->Notify(aParam); ++ // nulled if Removed during Broadcast ++ if (mBroadcastCopy[i]) { ++ mBroadcastCopy[i]->Notify(aParam); ++ } + } ++ mBroadcastCopy.Clear(); + } + + protected: + nsTArray*> mObservers; ++ nsTArray*> mBroadcastCopy; + }; + + } // namespace mozilla Added: head/www/waterfox/files/patch-bug1439236 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1439236 Mon May 28 23:53:59 2018 (r471070) @@ -0,0 +1,35 @@ +commit 7f6f5a06a070 +Author: Nils Ohlmeier [:drno] +Date: Wed May 16 09:51:35 2018 -0700 + + Bug 1439236 - Exit early if m_copym gets called with null ptr. r=dminor, a=RyanVM + + Cheery-picked upstream commit: + https://github.com/sctplab/usrsctp/commit/d89882d04900c80860874b5eb389b3ed3a0bca3d + + MozReview-Commit-ID: 36bYbfIaqEz + + --HG-- + extra : source : 2755492fe3d1daa9dd6066b049bc7bb5941b28e9 +--- + netwerk/sctp/src/user_mbuf.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git netwerk/sctp/src/user_mbuf.c netwerk/sctp/src/user_mbuf.c +index ec83931e66e5a..bd17f9fbada60 100755 +--- netwerk/sctp/src/user_mbuf.c ++++ netwerk/sctp/src/user_mbuf.c +@@ -987,6 +987,13 @@ m_copym(struct mbuf *m, int off0, int len, int wait) + + KASSERT(off >= 0, ("m_copym, negative off %d", off)); + KASSERT(len >= 0, ("m_copym, negative len %d", len)); ++ KASSERT(m != NULL, ("m_copym, m is NULL")); ++ ++#if !defined(INVARIANTS) ++ if (m == NULL) { ++ return (NULL); ++ } ++#endif + + if (off == 0 && m->m_flags & M_PKTHDR) + copyhdr = 1; Added: head/www/waterfox/files/patch-bug1463494 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1463494 Mon May 28 23:53:59 2018 (r471070) @@ -0,0 +1,50 @@ +commit 2314ad56620e +Author: Randell Jesup +Date: Fri May 25 21:16:28 2018 -0400 + + Bug 1463494 - Delete the sensor observerlist array in a deferred manner. r=froydnj, r=jchen, a=abillings + + Clean up sensorlist if Dispatch fails. + + --HG-- + extra : source : 494d77b62c333c2b71097d4ecf41c1a60dc495a2 +--- + hal/Hal.cpp | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git hal/Hal.cpp hal/Hal.cpp +index ddd7121a91dd1..6b389407f737a 100644 +--- hal/Hal.cpp ++++ hal/Hal.cpp +@@ -439,14 +439,29 @@ UnregisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) { + } + DisableSensorNotifications(aSensor); + +- // Destroy sSensorObservers only if all observer lists are empty. + for (int i = 0; i < NUM_SENSOR_TYPE; i++) { + if (gSensorObservers[i].Length() > 0) { + return; + } + } +- delete [] gSensorObservers; ++ ++ // We want to destroy gSensorObservers if all observer lists are ++ // empty, but we have to defer the deallocation via a runnable to ++ // mainthread (since we may be inside NotifySensorChange()/Broadcast() ++ // when it calls UnregisterSensorObserver()). ++ SensorObserverList* sensorlists = gSensorObservers; + gSensorObservers = nullptr; ++ ++ // Unlike DispatchToMainThread, DispatchToCurrentThread doesn't leak a runnable if ++ // it fails (and we assert we're on MainThread). ++ if (NS_FAILED(NS_DispatchToCurrentThread(NS_NewRunnableFunction("UnregisterSensorObserver", ++ [sensorlists]() -> void { ++ delete [] sensorlists; ++ })))) ++ { ++ // Still need to delete sensorlists if the dispatch fails ++ delete [] sensorlists; ++ } + } + + void