Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Mar 2018 23:59:15 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466104 - in head/mail/thunderbird: . files
Message-ID:  <201803312359.w2VNxFeR008567@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Mar 31 23:59:15 2018
New Revision: 466104
URL: https://svnweb.freebsd.org/changeset/ports/466104

Log:
  mail/thunderbird: apply CVE-2018-5148 fix

Added:
  head/mail/thunderbird/files/patch-bug1440717   (contents, props changed)
Modified:
  head/mail/thunderbird/Makefile   (contents, props changed)

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Sat Mar 31 22:55:33 2018	(r466103)
+++ head/mail/thunderbird/Makefile	Sat Mar 31 23:59:15 2018	(r466104)
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	52.7.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

Added: head/mail/thunderbird/files/patch-bug1440717
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1440717	Sat Mar 31 23:59:15 2018	(r466104)
@@ -0,0 +1,40 @@
+commit ae9da5994b51
+Author: Nicolas Silva <nsilva@mozilla.com>
+Date:   Mon Mar 12 13:36:00 2018 +0100
+
+    Bug 1440717 - Use RefPtr for CompositingRenderTargetOGL::mGL. r=Bas, a=ritu
+    
+    --HG--
+    extra : source : b6d2d55223d2aa5cb85bbdf33075d1d38f2a9a30
+    extra : intermediate-source : 0ec90964e0bc479412a4da8a61d48b665211736e
+---
+ gfx/layers/opengl/CompositingRenderTargetOGL.cpp | 2 +-
+ gfx/layers/opengl/CompositingRenderTargetOGL.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
+index c05b8edfd346..a1521c56da87 100644
+--- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
++++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
+@@ -60,7 +60,7 @@ CompositingRenderTargetOGL::BindRenderTarget()
+         msg.AppendPrintf("Framebuffer not complete -- CheckFramebufferStatus returned 0x%x, "
+                          "GLContext=%p, IsOffscreen()=%d, mFBO=%d, aFBOTextureTarget=0x%x, "
+                          "aRect.width=%d, aRect.height=%d",
+-                         result, mGL, mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget,
++                         result, mGL.get(), mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget,
+                          mInitParams.mSize.width, mInitParams.mSize.height);
+         NS_WARNING(msg.get());
+       }
+diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h
+index 501701d6f1a3..071dc5cac1c2 100644
+--- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h
++++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h
+@@ -184,7 +184,7 @@ private:
+    * the target is always cleared at the end of a frame.
+    */
+   RefPtr<CompositorOGL> mCompositor;
+-  GLContext* mGL;
++  RefPtr<GLContext> mGL;
+   GLuint mTextureHandle;
+   GLuint mFBO;
+ };



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803312359.w2VNxFeR008567>