From 86267901593d3e9d1539f7ee2d24b782d201fe2b Mon Sep 17 00:00:00 2001 From: jenglish Date: Tue, 15 May 2007 19:37:58 +0000 Subject: Fix crash introduced by previous fix, exposed under newer fontconfig libraries [Bug 1717830 again]. --- ChangeLog | 5 +++++ unix/tkUnixRFont.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 176f3b3..5363543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-15 Joe English + + * unix/tkUnixRFont.c: Fix crash introduced by previous fix + exposed under newer fontconfig libraries [Bug 1717830 again]. + 2007-05-15 Don Porter * generic/tkGrid.c: Stop crash due to list intrep shimmer [Bug 1677608] diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index f76213e..0913fa1 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixRFont.c,v 1.19 2007/05/15 16:15:54 jenglish Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.20 2007/05/15 19:37:58 jenglish Exp $ */ #include "tkUnixInt.h" @@ -248,9 +248,6 @@ FinishedWithFont( if (fontPtr->faces[i].ftFont) { XftFontClose(fontPtr->display, fontPtr->faces[i].ftFont); } - if (fontPtr->faces[i].source) { - FcPatternDestroy(fontPtr->faces[i].source); - } if (fontPtr->faces[i].charset) { FcCharSetDestroy(fontPtr->faces[i].charset); } -- cgit v0.12