Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xft/ChangeLog,v
retrieving revision 1.20
diff -u -p -r1.20 ChangeLog
--- ChangeLog	6 Sep 2004 06:24:29 -0000	1.20
+++ ChangeLog	28 Nov 2004 09:21:42 -0000
@@ -1,3 +1,9 @@
+2004-11-28  James Henstridge  <james@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@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
--- xftfreetype.c	4 Aug 2004 03:45:11 -0000	1.44
+++ 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);
 }