From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 24 Oct 2011 22:56:06 +0000 (-0700)
Subject: * print.c (PRINTFINISH): Undo alloca change; not needed.
X-Git-Tag: emacs-24.2.90~471^2~6^2~141
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee7804014888b29a0f75330ab305419a647925bb;p=emacs.git

* print.c (PRINTFINISH): Undo alloca change; not needed.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e2ef5e0eb2..c288ed6a2ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -553,7 +553,6 @@
 	(temp_output_buffer_setup, Fprin1_to_string, print_object):
 	Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts.
 	(PRINTPREPARE): Use int, not ptrdiff_t, where int is wide enough.
-	(PRINTFINISH): Use SAFE_ALLOCA, not alloca.
 	(printchar, strout): Use xpalloc to catch size calculation overflow.
 	(Fexternal_debugging_output): Use CHECK_CHARACTER, not CHECK_NUMBER,
 	to avoid mishandling large integers.
diff --git a/src/print.c b/src/print.c
index 8e5aab85c3c..63ef3e6279e 100644
--- a/src/print.c
+++ b/src/print.c
@@ -173,14 +173,12 @@ int print_output_debug_flag EXTERNALLY_VISIBLE = 1;
        if (print_buffer_pos != print_buffer_pos_byte			\
 	   && NILP (BVAR (current_buffer, enable_multibyte_characters)))	\
 	 {								\
-	   USE_SAFE_ALLOCA;						\
-	   unsigned char *temp;						\
-	   SAFE_ALLOCA (temp, unsigned char *, print_buffer_pos + 1);	\
+	   unsigned char *temp						\
+	     = (unsigned char *) alloca (print_buffer_pos + 1);		\
 	   copy_text ((unsigned char *) print_buffer, temp,		\
 		      print_buffer_pos_byte, 1, 0);			\
 	   insert_1_both ((char *) temp, print_buffer_pos,		\
 			  print_buffer_pos, 0, 1, 0);			\
-	   SAFE_FREE ();						\
 	 }								\
        else								\
 	 insert_1_both (print_buffer, print_buffer_pos,			\