merges r24127 and r24133 from trunk into ruby_1_9_1.

--
* dir.c (push_glob): fix GC problem.
--
* dir.c (push_glob): re-fix GC problem.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/dir.c b/dir.c
index a79d8e5b20..862f3ac6fc 100644
--- a/dir.c
+++ b/dir.c
@@ -1550,7 +1550,7 @@ push_glob(VALUE ary, VALUE str, int flags)
     args.value = ary;
     args.enc = enc;
 
-    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
+    return ruby_brace_glob0(StringValuePtr(str), flags | GLOB_VERBOSE,
 			    rb_glob_caller, (VALUE)&args, enc);
 }