2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71e06cb2e7..c0da5b57ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 14 07:20:17 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (EXPAND_PATH_BUFFER): make it back to usascii, to prevent
+	  infinite loop on some platform. [ruby-dev:40629]
+
 Sun Mar 14 02:40:38 2010  Tanaka Akira  <akr@fsij.org>
 
 	* tool/transcode-tblgen.rb: reject ambiguous mapping.
diff --git a/file.c b/file.c
index 0874732389..ce984f395b 100644
--- a/file.c
+++ b/file.c
@@ -2998,7 +2998,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
     return result;
 }
 
-#define EXPAND_PATH_BUFFER() rb_filesystem_str_new(0, MAXPATHLEN + 2)
+#define EXPAND_PATH_BUFFER() rb_usascii_str_new(0, MAXPATHLEN + 2)
 
 #define check_expand_path_args(fname, dname) \
     ((fname = rb_get_path(fname)), \