* fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 15cd195b4ed..298e2a5808d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2004-06-17  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+	* fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.
+
 	* macfns.c (Fx_display_color_cells): Do not limit return value to 256.
 
 	* macterm.c (mac_initialize_display_info): Initialize n_planes correctly
diff --git a/src/fns.c b/src/fns.c
index 6001d99fb49..9c5a9d1282b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1049,16 +1049,24 @@ string_make_unibyte (string)
      Lisp_Object string;
 {
   unsigned char *buf;
+  Lisp_Object ret;
 
   if (! STRING_MULTIBYTE (string))
     return string;
 
-  buf = (unsigned char *) alloca (SCHARS (string));
+  /* We can not use alloca here, because string might be very long.
+     For example when selecting megabytes of text and then pasting it to
+     another application.  */
+  buf = (unsigned char *) xmalloc (SCHARS (string));
 
   copy_text (SDATA (string), buf, SBYTES (string),
 	     1, 0);
 
-  return make_unibyte_string (buf, SCHARS (string));
+  ret = make_unibyte_string (buf, SCHARS (string));
+
+  xfree (buf);
+
+  return ret;
 }
 
 DEFUN ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte,