[Emacs-diffs] /srv/bzr/emacs/trunk r99450: Fix for Bug#5526.

[Chong Yidong]

------------------------------------------------------------
revno: 99450
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-04 22:54:49 -0500
message:
  Fix for Bug#5526.
  
  * charset.c (load_charset_map_from_file): Allocate large
  charset_map_entries structure on the heap rather than the stack.
  (Bug#5526).
modified:
  src/ChangeLog
  src/charset.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-31 07:01:05 +0000
+++ b/src/ChangeLog     2010-02-05 03:54:49 +0000
@@ -1,3 +1,9 @@
+2010-02-05  Chong Yidong  <address@hidden>
+
+       * charset.c (load_charset_map_from_file): Allocate large
+       charset_map_entries structure on the heap rather than the stack.
+       (Bug#5526).
+
 2010-01-31  Kenichi Handa  <address@hidden>
 
        * font.c (font_parse_xlfd): If FONT is a font-entity and pixel

=== modified file 'src/charset.c'
--- a/src/charset.c     2010-01-13 08:35:10 +0000
+++ b/src/charset.c     2010-02-05 03:54:49 +0000
@@ -526,7 +526,7 @@
     error ("Failure in loading charset map: %S", SDATA (mapfile));
 
   head = entries = ((struct charset_map_entries *)
-                   alloca (sizeof (struct charset_map_entries)));
+                   xmalloc (sizeof (struct charset_map_entries)));
   n_entries = 0;
   eof = 0;
   while (1)
@@ -563,6 +563,7 @@
   close (fd);
 
   load_charset_map (charset, head, n_entries, control_flag);
+  xfree (head);
 }
 
 static void