rpms/xorg-x11/devel xorg-x11-6.8.2-xft-releasefile-crash.patch, NONE, 1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 22 16:39:31 UTC 2005
Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10208
Added Files:
xorg-x11-6.8.2-xft-releasefile-crash.patch
Log Message:
cvs add xorg-x11-6.8.2-xft-releasefile-crash.patch
xorg-x11-6.8.2-xft-releasefile-crash.patch:
ChangeLog | 6 ++++++
xftfreetype.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE xorg-x11-6.8.2-xft-releasefile-crash.patch ---
Patch by James Henstridge to fix a SEGV bug in libXft.
Fixes bugs:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155634
https://bugs.freedesktop.org/show_bug.cgi?id=1951
Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xft/ChangeLog,v
retrieving revision 1.20
diff -u -p -r1.20 ChangeLog
--- xc/lib/Xft/ChangeLog 6 Sep 2004 06:24:29 -0000 1.20
+++ xc/lib/Xft/ChangeLog 28 Nov 2004 09:21:42 -0000
@@ -1,3 +1,9 @@
+2004-11-28 James Henstridge <james at jamesh.id.au>
+
+ * xftfreetype.c (_XftReleaseFile): add parentheses in the
+ expression in the second argument to XftMemFree so that it is
+ interpreted correctly.
+
2004-09-05 Keith Packard <keithp at keithp.com>
* configure.ac:
Index: xftfreetype.c
===================================================================
RCS file: /cvs/xlibs/Xft/xftfreetype.c,v
retrieving revision 1.44
diff -u -p -r1.44 xftfreetype.c
--- xc/lib/Xft/xftfreetype.c 4 Aug 2004 03:45:11 -0000 1.44
+++ xc/lib/Xft/xftfreetype.c 28 Nov 2004 09:21:42 -0000
@@ -286,7 +286,7 @@ _XftReleaseFile (XftFtFile *f)
FT_Done_Face (f->face);
}
XftMemFree (XFT_MEM_FILE,
- sizeof (XftFtFile) + f->file ? strlen (f->file) + 1 : 0);
+ sizeof (XftFtFile) + (f->file ? strlen (f->file) + 1 : 0));
free (f);
}
More information about the fedora-cvs-commits
mailing list