Fix a double-free while performing print operations which could trigger a

segmentation fault if malloc debugging was enabled.

Reported by:	dougb

18 files changed, 243 insertions, 3 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index d06aec833e76..ca941cdd1324 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.8
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/mail/thunderbird-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d06aec833e76..ca941cdd1324 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.8
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/mail/thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/mail/thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index d06aec833e76..ca941cdd1324 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.8
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird3/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/mail/thunderbird3/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/mail/thunderbird3/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 2abeb1d7401d..86e94687293d 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/www/firefox-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/firefox-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/firefox-esr/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2abeb1d7401d..86e94687293d 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/www/firefox/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/firefox/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/firefox/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index c5b91e0bea9e..1e7ff0ef4aff 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	1.5.0.8
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/www/firefox15/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/firefox15/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/firefox15/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 2abeb1d7401d..86e94687293d 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/www/firefox36/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/firefox36/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/firefox36/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index aedaf9360cf2..889c113cf75e 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/seamonkey/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index aedaf9360cf2..889c113cf75e 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey2/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/seamonkey2/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/seamonkey2/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
@@ -0,0 +1,26 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
++++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
+@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
+ 
+ nsFontPSXft::~nsFontPSXft()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;
+@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
+ 
+ nsXftType1Generator::~nsXftType1Generator()
+ {
+-  if (mEntry->mFace) 
++  if (mEntry->mFace) {
+     FT_Done_Face(mEntry->mFace);
++    mEntry->mFace = nsnull;
++  }
+ 
+   if (FT_Done_FreeType(mFreeTypeLibrary))
+     return;