merge revision(s) 17719:

shyouhei · shyouhei · commit b3f0632590aa · 2008-07-17T12:33:59.000Z
* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
	  problem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 21:32:49 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+	  problem.
+
 Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#environment): requires shellwords.
diff --git a/string.c b/string.c
@@ -462,7 +462,7 @@ static VALUE
 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);
diff --git a/version.h b/version.h
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ static VALUE`
`462`	`462`	`rb_str_format_m(str, arg)`
`463`	`463`	`VALUE str, arg;`
`464`	`464`	`{`
`465`		`- VALUE tmp = rb_check_array_type(arg);`
	`465`	`+ volatile VALUE tmp = rb_check_array_type(arg);`
`466`	`466`
`467`	`467`	`if (!NIL_P(tmp)) {`
`468`	`468`	`return rb_str_format(RARRAY_LEN(tmp), RARRAY_PTR(tmp), str);`