From fc86da016cc987c4b71190dc00a3b0d326068355 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 27 Mar 2005 23:54:40 +0000 Subject: Fix a crash that can occur when using TrueType fonts. This should have gone in with X.Org 6.8.2, but since we're using the external libXft library, it was missed. Reported by: adamw Obtained from: Freedesktop.org CVS Approved by: portmgr (implicit) --- x11-fonts/libXft/Makefile | 1 + x11-fonts/libXft/files/patch-xftfreetype.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 x11-fonts/libXft/files/patch-xftfreetype.c (limited to 'x11-fonts') diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index cf75a4d4dd9d..d20a0946116b 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -7,6 +7,7 @@ PORTNAME= libXft PORTVERSION= 2.1.6 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/ diff --git a/x11-fonts/libXft/files/patch-xftfreetype.c b/x11-fonts/libXft/files/patch-xftfreetype.c new file mode 100644 index 000000000000..2868f3d52a1f --- /dev/null +++ b/x11-fonts/libXft/files/patch-xftfreetype.c @@ -0,0 +1,12 @@ +--- xftfreetype.c.orig Sun Mar 27 18:51:12 2005 ++++ xftfreetype.c Sun Mar 27 18:51:53 2005 +@@ -289,7 +289,8 @@ _XftReleaseFile (XftFtFile *f) + if (f->face) + FT_Done_Face (f->face); + } +- XftMemFree (XFT_MEM_FILE, sizeof (XftFtFile) + strlen (f->file) + 1); ++ XftMemFree (XFT_MEM_FILE, ++ sizeof (XftFtFile) + (f->file ? strlen (f->file) + 1 : 0)); + free (f); + } + -- cgit v1.2.3