Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
   Make sure image types are initialized for lookup too

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-412
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-413
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-414
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-415
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-418
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-202

1 files changed, 9 insertions, 3 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 6387c4bc845..25a5a3d12b8 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,5 +1,6 @@
 /* GNU Emacs case conversion functions.
-   Copyright (C) 1985, 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -109,8 +110,12 @@ casify_object (flag, obj)
               /* The work is not yet finished because of a multibyte
                  character just encountered.  */
               int fromlen, j_byte = i;
-              char *buf
-                = (char *) alloca ((len - i) * MAX_MULTIBYTE_LENGTH + i);
+              char *buf;
+              int bufsize;
+              USE_SAFE_ALLOCA;
+
+              bufsize = (len - i) * MAX_MULTIBYTE_LENGTH + i;
+              SAFE_ALLOCA (buf, char *, bufsize);
 
               /* Copy data already handled.  */
               bcopy (SDATA (obj), buf, i);
@@ -132,6 +137,7 @@ casify_object (flag, obj)
                 }
               obj = make_multibyte_string (buf, SCHARS (obj),
                                            j_byte);
+              SAFE_FREE (bufsize);
             }
           return obj;
         }