Allocate large arrays statically in fc-lang to fix crashes under

    MinGW/MSYS.

diff --git a/ChangeLog b/ChangeLog
index 78aa4aef96afd79abc14c32ffcdb5d39c2cd4853..5265c6d999875e82840a877f68ee1e5cc28b5301 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-21  Patrick Lam  <plam@mit.edu>
+       * fc-lang/fc-lang.c:
+
+       Allocate large arrays statically in fc-lang to fix crashes under
+       MinGW/MSYS.
+
 2006-02-21  Diego Petten  <flameeyes@gentoo.org>
        * src/fcfreetype.c (FcFreeTypeCharIndex):
 

diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 97ffa6515e96d7af71b7688c899e4ce07953eec8..ebb853953d0753d03a0af08b5b999daffc627978 100644 (file)
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -227,13 +227,13 @@ static int compare (const void *a, const void *b)
 int
 main (int argc, char **argv)
 {
-    char       *files[MAX_LANG];
-    FcCharSet  *sets[MAX_LANG];
-    int                duplicate[MAX_LANG];
-    int                offsets[MAX_LANG];
-    int                country[MAX_LANG];
-    char       *names[MAX_LANG];
-    char       *langs[MAX_LANG];
+    static char                *files[MAX_LANG];
+    static FcCharSet   *sets[MAX_LANG];
+    static int         duplicate[MAX_LANG];
+    static int         offsets[MAX_LANG];
+    static int         country[MAX_LANG];
+    static char                *names[MAX_LANG];
+    static char                *langs[MAX_LANG];
     FILE       *f;
     int         offset = 0;
     int                ncountry = 0;
@@ -244,8 +244,8 @@ main (int argc, char **argv)
     int                offset_count = 0;
     int                l, sl, tl;
     int                c;
-    char       line[1024];
-    FcChar32   map[MAX_LANG_SET_MAP];
+    static char                line[1024];
+    static FcChar32    map[MAX_LANG_SET_MAP];
     int                num_lang_set_map;
     int                setRangeStart[26];
     int                setRangeEnd[26];