shyouhei	2008-07-17 21:33:59 +0900 (Thu, 17 Jul 2008)

  New Revision: 18114

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

  Log:
    merge revision(s) 17719:
    * string.c (rb_str_format_m): make tmp volatile to avoid possible GC
      problem.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/string.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18113)
+++ ruby_1_8_7/ChangeLog	(revision 18114)
@@ -1,3 +1,8 @@
+Thu Jul 17 21:32:49 2008  Tanaka Akira  <akr@f...>
+
+	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+	  problem.
+
 Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (OptionParser#environment): requires shellwords.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18113)
+++ ruby_1_8_7/version.h	(revision 18114)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-17"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080717
-#define RUBY_PATCHLEVEL 61
+#define RUBY_PATCHLEVEL 62
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/string.c
===================================================================
--- ruby_1_8_7/string.c	(revision 18113)
+++ ruby_1_8_7/string.c	(revision 18114)
@@ -462,7 +462,7 @@
 rb_str_format_m(str, arg)
     VALUE str, arg;
 {
-    VALUE tmp = rb_check_array_type(arg);
+    volatile VALUE tmp = rb_check_array_type(arg);
 
     if (!NIL_P(tmp)) {
 	return rb_str_format(RARRAY_LEN(tmp), RARRAY_PTR(tmp), str);

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