summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 14:03:38 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 14:03:38 +0000
commit15403c9b743bfdb246b0f1cc2ad91ed8e5fcbb24 (patch)
tree4e75052144f2f7fc36ea5b7bf2249a87c585486c
parentb9625fdddf2801a9e10905e3f15b4dad80b4d1c6 (diff)
downloadruby-15403c9b743bfdb246b0f1cc2ad91ed8e5fcbb24.tar.gz
ruby-15403c9b743bfdb246b0f1cc2ad91ed8e5fcbb24.tar.xz
ruby-15403c9b743bfdb246b0f1cc2ad91ed8e5fcbb24.zip
* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
problem. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66de79ce9..92ae8ea1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 23:01:54 2008 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+ problem.
+
Sun Jun 29 18:01:30 2008 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/parser.rb, lib/rss/utils.rb: merge documents from ruby_1_8.
diff --git a/string.c b/string.c
index 49f3ba945..983f3e682 100644
--- a/string.c
+++ b/string.c
@@ -957,7 +957,7 @@ rb_str_times(VALUE str, VALUE times)
static VALUE
rb_str_format_m(VALUE str, VALUE 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);