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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ddd3f477..6b37b63ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 16 08:56:32 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (push_glob): re-fix GC problem.
+
+Wed Jul 15 23:45:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (push_glob): fix GC problem.
+
 Tue May  5 10:42:28 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json: Update to JSON 1.1.4.
diff --git a/dir.c b/dir.c
index a79d8e5b2..862f3ac6f 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);
 }
 
diff --git a/version.h b/version.h
index f58fd8507..951d7f798 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-15"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1