yugui	2009-07-17 19:07:25 +0900 (Fri, 17 Jul 2009)

  New Revision: 24169

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24169

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/dir.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24168)
+++ ruby_1_9_1/ChangeLog	(revision 24169)
@@ -1,3 +1,11 @@
+Thu Jul 16 08:56:32 2009  Koichi Sasada  <ko1@a...>
+
+	* dir.c (push_glob): re-fix GC problem.
+
+Wed Jul 15 23:45:11 2009  Koichi Sasada  <ko1@a...>
+
+	* dir.c (push_glob): fix GC problem.
+
 Tue May  5 10:42:28 2009  NARUSE, Yui  <naruse@r...>
 
 	* ext/json: Update to JSON 1.1.4.
Index: ruby_1_9_1/dir.c
===================================================================
--- ruby_1_9_1/dir.c	(revision 24168)
+++ ruby_1_9_1/dir.c	(revision 24169)
@@ -1550,7 +1550,7 @@
     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);
 }
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24168)
+++ ruby_1_9_1/version.h	(revision 24169)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/