merges r28885 from trunk into ruby_1_9_2.

--
* file.c (realpath_rec): rb_str_modify depends on the length, so
  resize instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ef6010b79..ad4003dcd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  6 18:59:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (realpath_rec): rb_str_modify depends on the length, so
+	  resize instead.
+
 Thu Aug  5 21:20:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
diff --git a/file.c b/file.c
index 47a2269fb1..7c5367ff3a 100644
--- a/file.c
+++ b/file.c
@@ -3216,7 +3216,7 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopche
                 char *resolved_names = RSTRING_PTR(*resolvedp) + *prefixlenp;
                 char *lastsep = rb_path_last_separator(resolved_names);
                 long len = lastsep ? lastsep - resolved_names : 0;
-                rb_str_set_len(*resolvedp, *prefixlenp + len);
+                rb_str_resize(*resolvedp, *prefixlenp + len);
             }
         }
         else {