diff --git a/ChangeLog b/ChangeLog
index d32ad13f1a..4cfa151a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
+
 Wed Nov 24 01:01:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_read): [ruby-dev:24952]
diff --git a/dir.c b/dir.c
index 84476303a0..330a9c5eed 100644
--- a/dir.c
+++ b/dir.c
@@ -1189,9 +1189,6 @@ push_braces(ary, str, flags)
 
     if (lbrace && rbrace) {
 	int len = strlen(s);
-	buf = rb_str_new(0, len+1);
-	memcpy(RSTRING(buf)->ptr, s, lbrace-s);
-	b = RSTRING(buf)->ptr + (lbrace-s);
 	p = lbrace;
 	while (*p != '}') {
 	    t = p + 1;
@@ -1199,6 +1196,9 @@ push_braces(ary, str, flags)
 		/* skip inner braces */
 		if (*p == '{') while (*p!='}') p++;
 	    }
+	    buf = rb_str_new(0, len+1);
+	    memcpy(RSTRING(buf)->ptr, s, lbrace-s);
+	    b = RSTRING(buf)->ptr + (lbrace-s);
 	    memcpy(b, t, p-t);
 	    strcpy(b+(p-t), rbrace+1);
 	    status = push_braces(ary, buf, flags);