summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:33:59 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:33:59 (GMT)
commitb3f0632590aa73ed84cec022b43718e2b94dfbfb (patch)
tree12da46385fb04b39e2f3badb876833709d444e5f
parent3ac9914334ca12c9cc6d6312b6e1ad7091fde4a3 (diff)
merge revision(s) 17719:
* 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
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ea9100a..73c2a27 100644
--- 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
index d66268a..e0cd9c5 100644
--- 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
index 66765f7..e89a602 100644
--- 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