aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2006-12-16 06:14:33 +0800
committerahze <ahze@FreeBSD.org>2006-12-16 06:14:33 +0800
commit010c725af0907a54f07b95669042436edacd666f (patch)
tree00398f194347f652dc6d20a2f8ee194213a1880e
parentef2b155b373ec84567107ff0b6a0204c0101de42 (diff)
downloadfreebsd-ports-gnome-010c725af0907a54f07b95669042436edacd666f.tar.gz
freebsd-ports-gnome-010c725af0907a54f07b95669042436edacd666f.tar.zst
freebsd-ports-gnome-010c725af0907a54f07b95669042436edacd666f.zip
Fix a double-free while performing print operations which could trigger a
segmentation fault if malloc debugging was enabled. Submitted by: marcus Reported by: dougb
Diffstat
-rw-r--r--deskutils/lightning-thunderbird/Makefile1
-rw-r--r--deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
-rw-r--r--deskutils/lightning/Makefile1
-rw-r--r--deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
-rw-r--r--deskutils/sunbird/Makefile1
-rw-r--r--deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
-rw-r--r--mail/lightning/Makefile2
-rw-r--r--mail/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
-rw-r--r--www/flock/Makefile2
-rw-r--r--www/flock/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
-rw-r--r--www/xulrunner/Makefile2
-rw-r--r--www/xulrunner/files/patch-gfx_src_ps_nsFontMetricsPS.cpp26
12 files changed, 162 insertions, 3 deletions
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 25613fddbaaf..6cc961b687cd 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sunbird
PORTVERSION= 0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/deskutils/lightning-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/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 25613fddbaaf..6cc961b687cd 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sunbird
PORTVERSION= 0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/deskutils/lightning/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/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 25613fddbaaf..6cc961b687cd 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sunbird
PORTVERSION= 0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
diff --git a/deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/deskutils/sunbird/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/lightning/Makefile b/mail/lightning/Makefile
index dfb276c43f44..d52e10c93ab3 100644
--- a/mail/lightning/Makefile
+++ b/mail/lightning/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lightning
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}/source
diff --git a/mail/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/mail/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/mail/lightning/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/flock/Makefile b/www/flock/Makefile
index 41824f80336f..90a0bc09cfd9 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= flock
DISTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_LOCAL}
# http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock
diff --git a/www/flock/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/flock/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/flock/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/xulrunner/Makefile b/www/xulrunner/Makefile
index f809c09324d6..199dec56c613 100644
--- a/www/xulrunner/Makefile
+++ b/www/xulrunner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xulrunner
PORTVERSION= 1.8.0.4
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/
diff --git a/www/xulrunner/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/www/xulrunner/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
new file mode 100644
index 000000000000..07014d87fa82
--- /dev/null
+++ b/www/xulrunner/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;
generated by cgit (git 2.34.1) at 2024-11-20 11:52:20 +0800