summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:32:16 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:32:16 +0000
commita571edd80a8a30fc9fba79ebe5bf7bf9133e1f63 (patch)
tree8f3e54bd980f3d285480aab1af2645de014e8470
parent98d848a90bfb72da552c2705c2dbecbdbc72ad8c (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_6@18112 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 897d022..d4c33aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 21:31:46 2008 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+ problem.
+
Thu Jul 17 21:29:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#environment): requires shellwords.
diff --git a/string.c b/string.c
index cb619f8..2f380e1 100644
--- a/string.c
+++ b/string.c
@@ -455,7 +455,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 f6b4dc9..7778599 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-07-17"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080717
-#define RUBY_PATCHLEVEL 277
+#define RUBY_PATCHLEVEL 278
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8