From: Romain Francoise <romain@orebokech.com>
Date: Sat, 10 Sep 2005 19:55:28 +0000 (+0000)
Subject: (init_buffer): Grow buffer to add directory separator
X-Git-Tag: emacs-pretest-22.0.90~7168
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=156bdb41309e1a8311190c3c92d8da4548d1e604;p=emacs.git

(init_buffer): Grow buffer to add directory separator
and terminal zero.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 24f0dccea98..f47e48c812d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-10  Romain Francoise  <romain@orebokech.com>
+
+	* buffer.c (init_buffer): Grow buffer to add directory separator
+	and terminal zero.
+
 2005-09-10  Eli Zaretskii  <eliz@gnu.org>
 
 	* buffer.c (init_buffer): Fix error message for failed call to
diff --git a/src/buffer.c b/src/buffer.c
index 448ef87413a..e2805a3d1c2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5135,7 +5135,7 @@ init_buffer ()
 
   pwd = get_current_dir_name ();
 
-  if(!pwd)
+  if (!pwd)
     fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
 
 #ifndef VMS
@@ -5144,6 +5144,8 @@ init_buffer ()
   rc = strlen (pwd);
   if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
     {
+      /* Grow buffer to add directory separator and '\0'.  */
+      pwd = (char *) xrealloc (pwd, rc + 2);
       pwd[rc] = DIRECTORY_SEP;
       pwd[rc + 1] = '\0';
     }
@@ -5152,7 +5154,7 @@ init_buffer ()
   current_buffer->directory = make_unibyte_string (pwd, strlen (pwd));
   if (! NILP (buffer_defaults.enable_multibyte_characters))
     /* At this momemnt, we still don't know how to decode the
-       direcotry name.  So, we keep the bytes in multibyte form so
+       directory name.  So, we keep the bytes in multibyte form so
        that ENCODE_FILE correctly gets the original bytes.  */
     current_buffer->directory
       = string_to_multibyte (current_buffer->directory);