Xft ChangeLog,1.18,1.19 xftfreetype.c,1.43,1.44

[Keith Packard]

Committed by: keithp

Update of /cvs/xlibs/Xft
In directory pdx:/tmp/cvs-serv3285

Modified Files:
	ChangeLog xftfreetype.c 
Log Message:
2004-08-03  Keith Packard  <keithp at keithp.com>

	* xftfreetype.c: (_XftReleaseFile):
	Called strlen with (f->file) without checking for NULL (which
	happens when directly using FT_Face objects).


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xft/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	15 Apr 2004 01:45:47 -0000	1.18
+++ ChangeLog	4 Aug 2004 03:45:10 -0000	1.19
@@ -1,3 +1,9 @@
+2004-08-03  Keith Packard  <keithp at keithp.com>
+
+	* xftfreetype.c: (_XftReleaseFile):
+	Called strlen with (f->file) without checking for NULL (which
+	happens when directly using FT_Face objects).
+
 2004-04-14  Keith Packard  <keithp at keithp.com>
 
 	* AUTHORS:

Index: xftfreetype.c
===================================================================
RCS file: /cvs/xlibs/Xft/xftfreetype.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- xftfreetype.c	15 Apr 2004 01:45:47 -0000	1.43
+++ xftfreetype.c	4 Aug 2004 03:45:11 -0000	1.44
@@ -285,7 +285,8 @@
 	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);
 }