From cb901902d4e5939c809521cdee8f2b83f9e31a17 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 17 Jul 2008 12:32:16 +0000 Subject: merge revision(s) 17719: * string.c (rb_str_format_m): make tmp volatile to avoid possible GC problem. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@18112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 897d0228e..d4c33aac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 17 21:31:46 2008 Tanaka Akira + + * string.c (rb_str_format_m): make tmp volatile to avoid possible GC + problem. + Thu Jul 17 21:29:34 2008 Nobuyoshi Nakada * lib/optparse.rb (OptionParser#environment): requires shellwords. diff --git a/string.c b/string.c index cb619f86b..2f380e1ec 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 f6b4dc98c..777859941 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 -- cgit