From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 21 Feb 2006 14:12:41 +0000 (+0000)
Subject: Initialize fontconfig library in fc-cat to avoid segfault.
X-Git-Tag: fc-2_3_94~12
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9769b43d4a4d8fe5480b672124f764e5bac1f4c9;p=fontconfig.git

Initialize fontconfig library in fc-cat to avoid segfault.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index 737db03..ecce9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-21  Mike Fabian  <mfabian@suse.de>
+	reviewed by: plam
+	
+	* fc-cat/fc-cat.c (main):
+
+	Initialize fontconfig library in fc-cat to avoid segfault.
+
 2006-02-18  Patrick Lam  <plam@mit.edu>
 	* fc-cache/fc-cache.c (scanDirs):
 	* src/fccache.c (FcCacheReadDirs):
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index f466e3e..0bcc485 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -396,6 +396,7 @@ main (int argc, char **argv)
     FcFontSet	*fs = FcFontSetCreate();
     FcStrSet    *dirs = FcStrSetCreate();
     char	*name_buf;
+    FcConfig	*config;
 
 #if HAVE_GETOPT_LONG
     while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1)
@@ -417,6 +418,14 @@ main (int argc, char **argv)
     i = 1;
 #endif
 
+    config = FcInitLoadConfig ();
+    if (!config)
+    {
+	fprintf (stderr, "%s: Can't init font config library\n", argv[0]);
+	return 1;
+    }
+    FcConfigSetCurrent (config);
+    
     if (i >= argc)
         usage (argv[0]);
 
@@ -425,7 +434,7 @@ main (int argc, char **argv)
         char * dummy_name = (char *)FcStrPlus ((FcChar8 *)argv[i], 
                                                (FcChar8 *)"/dummy");
         if (!FcDirScanConfig (fs, dirs, 0, 0, 
-                              (const FcChar8 *)argv[i], FcFalse, 0))
+                              (const FcChar8 *)argv[i], FcFalse, config))
             fprintf (stderr, "couldn't load font dir %s\n", argv[i]);
         else
         {