# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1204904550 0
# Node ID 7a2d0126392f17a3cb3cf5deeb650944fa112781
# Parent  60443150f1b2f4935c6885d924612ff2910dbacf
(Fsubstitute_in_file_name): Fix up computation of maximum
size of resulting string.

diff -r 60443150f1b2 -r 7a2d0126392f src/ChangeLog
--- a/src/ChangeLog	Fri Mar 07 03:54:03 2008 +0000
+++ b/src/ChangeLog	Fri Mar 07 15:42:30 2008 +0000
@@ -1,3 +1,8 @@
+2008-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum
+	size of resulting string.
+
 2008-03-05  Jason Rumney  <jasonr@gnu.org>
 
 	* dispnew.c (adjust_glyph_matrix): Initialize window_height.
diff -r 60443150f1b2 -r 7a2d0126392f src/fileio.c
--- a/src/fileio.c	Fri Mar 07 03:54:03 2008 +0000
+++ b/src/fileio.c	Fri Mar 07 15:42:30 2008 +0000
@@ -2226,8 +2226,8 @@
 	/* Get variable value */
 	o = (unsigned char *) egetenv (target);
 	if (o)
-	  {
-	    total += strlen (o);
+	  { /* Eight-bit chars occupy upto 2 bytes in multibyte.  */
+	    total += strlen (o) * (STRING_MULTIBYTE (filename) ? 2 : 1);
 	    substituted = 1;
 	  }
 	else if (*p == '}')