Attachment 69536 Details for Bug 152453

[patch] fc-cat-crash.patch

fc-cat-crash.patch (text/plain), 1.21 KB, created by Mike Fabian on 2006-02-21 11:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fabian

Created: 2006-02-21 11:38:57 UTC

Size: 1.21 KB

patch

obsolete

>diff -ru fontconfig-2.3.93.20060220.orig/fc-cat/fc-cat.c fontconfig-2.3.93.20060220/fc-cat/fc-cat.c
>--- fontconfig-2.3.93.20060220.orig/fc-cat/fc-cat.c	2006-02-17 16:43:53.000000000 +0100
>+++ fontconfig-2.3.93.20060220/fc-cat/fc-cat.c	2006-02-21 12:18:02.000000000 +0100
>@@ -396,6 +396,7 @@
>     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 @@
>     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 @@
>         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
>         {

Actions: View | Diff

Attachments on bug 152453: 69536