Date: Mon, 4 Jun 2018 23:39:47 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471735 - in branches/2018Q2/www/waterfox: . files Message-ID: <201806042339.w54Ndl4L055585@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jun 4 23:39:46 2018 New Revision: 471735 URL: https://svnweb.freebsd.org/changeset/ports/471735 Log: MFH: r471734 www/waterfox: apply some FF61 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1464784 - copied unchanged from r471734, head/www/waterfox/files/patch-bug1464784 branches/2018Q2/www/waterfox/files/patch-bug1465686 - copied unchanged from r471734, head/www/waterfox/files/patch-bug1465686 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Mon Jun 4 23:39:09 2018 (r471734) +++ branches/2018Q2/www/waterfox/Makefile Mon Jun 4 23:39:46 2018 (r471735) @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-31 DISTVERSIONSUFFIX= -gf435a827f82ac -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1464784 (from r471734, head/www/waterfox/files/patch-bug1464784) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1464784 Mon Jun 4 23:39:46 2018 (r471735, copy of r471734, head/www/waterfox/files/patch-bug1464784) @@ -0,0 +1,68 @@ +commit b175f5f2113b +Author: Boris Zbarsky <bzbarsky@mit.edu> +Date: Thu May 31 12:43:01 2018 -0400 + + Bug 1464784 - Hold a strong ref to the document in callers of ConvertNodesOrStringsIntoNode. r=smaug, a=abillings +--- + dom/base/nsINode.cpp | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git dom/base/nsINode.cpp dom/base/nsINode.cpp +index 3a649a61d0274..fbbf1efcb2dde 100644 +--- dom/base/nsINode.cpp ++++ dom/base/nsINode.cpp +@@ -1777,8 +1777,8 @@ nsINode::Before(const Sequence<OwningNodeOrString>& aNodes, + nsCOMPtr<nsINode> viablePreviousSibling = + FindViablePreviousSibling(*this, aNodes); + +- nsCOMPtr<nsINode> node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr<nsIDocument> doc = OwnerDoc(); ++ nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1800,8 +1800,8 @@ nsINode::After(const Sequence<OwningNodeOrString>& aNodes, + + nsCOMPtr<nsINode> viableNextSibling = FindViableNextSibling(*this, aNodes); + +- nsCOMPtr<nsINode> node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr<nsIDocument> doc = OwnerDoc(); ++ nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1820,8 +1820,8 @@ nsINode::ReplaceWith(const Sequence<OwningNodeOrString>& aNodes, + + nsCOMPtr<nsINode> viableNextSibling = FindViableNextSibling(*this, aNodes); + +- nsCOMPtr<nsINode> node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr<nsIDocument> doc = OwnerDoc(); ++ nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1880,8 +1880,8 @@ void + nsINode::Prepend(const Sequence<OwningNodeOrString>& aNodes, + ErrorResult& aRv) + { +- nsCOMPtr<nsINode> node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr<nsIDocument> doc = OwnerDoc(); ++ nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } +@@ -1894,8 +1894,8 @@ void + nsINode::Append(const Sequence<OwningNodeOrString>& aNodes, + ErrorResult& aRv) + { +- nsCOMPtr<nsINode> node = +- ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv); ++ nsCOMPtr<nsIDocument> doc = OwnerDoc(); ++ nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv); + if (aRv.Failed()) { + return; + } Copied: branches/2018Q2/www/waterfox/files/patch-bug1465686 (from r471734, head/www/waterfox/files/patch-bug1465686) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1465686 Mon Jun 4 23:39:46 2018 (r471735, copy of r471734, head/www/waterfox/files/patch-bug1465686) @@ -0,0 +1,52 @@ +commit e963f75ef278 +Author: Lee Salzman <lsalzman@mozilla.com> +Date: Fri Jun 1 15:52:26 2018 -0400 + + Bug 1465686 - Validate SkArenaAlloc sizes. r=rhunt, a=RyanVM + + MozReview-Commit-ID: Cc4cxKeF4xn + + --HG-- + extra : source : 9019db1eaddb79dbfd1d4c357765599499eb02b4 +--- + gfx/skia/skia/src/core/SkArenaAlloc.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git gfx/skia/skia/src/core/SkArenaAlloc.h gfx/skia/skia/src/core/SkArenaAlloc.h +index c9e7274e63ded..b93054cff0177 100644 +--- gfx/skia/skia/src/core/SkArenaAlloc.h ++++ gfx/skia/skia/src/core/SkArenaAlloc.h +@@ -112,9 +112,14 @@ public: + return sk_sp<T>(SkRef(this->make<T>(std::forward<Args>(args)...))); + } + ++ uint32_t safeU32(size_t n) { ++ SkASSERT_RELEASE(SkTFitsIn<uint32_t>(n)); ++ return uint32_t(n); ++ } ++ + template <typename T> + T* makeArrayDefault(size_t count) { +- uint32_t safeCount = SkTo<uint32_t>(count); ++ uint32_t safeCount = safeU32(count); + T* array = (T*)this->commonArrayAlloc<T>(safeCount); + + // If T is primitive then no initialization takes place. +@@ -126,7 +131,7 @@ public: + + template <typename T> + T* makeArray(size_t count) { +- uint32_t safeCount = SkTo<uint32_t>(count); ++ uint32_t safeCount = safeU32(count); + T* array = (T*)this->commonArrayAlloc<T>(safeCount); + + // If T is primitive then the memory is initialized. For example, an array of chars will +@@ -139,7 +144,7 @@ public: + + // Only use makeBytesAlignedTo if none of the typed variants are impractical to use. + void* makeBytesAlignedTo(size_t size, size_t align) { +- auto objStart = this->allocObject(SkTo<uint32_t>(size), SkTo<uint32_t>(align)); ++ auto objStart = this->allocObject(safeU32(size), safeU32(align)); + fCursor = objStart + size; + return objStart; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806042339.w54Ndl4L055585>