diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-12-15 22:14:33 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-12-15 22:14:33 +0000 |
| commit | ea5fec4f4f6a558ca87048c93abfe94e61f560c9 (patch) | |
| tree | beef8c07eeb7c54c73d77d0b97140f7c6e95f737 /www/flock | |
| parent | - Update to 0.9 (diff) | |
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 (limited to 'www/flock')
| -rw-r--r-- | www/flock/Makefile | 2 | ||||
| -rw-r--r-- | www/flock/files/patch-gfx_src_ps_nsFontMetricsPS.cpp | 26 |
2 files changed, 27 insertions, 1 deletions
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; |