diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-14 09:52:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-14 09:52:10 +0000 |
commit | 698d21a276f862da823c7a6536f9c15afe602e19 (patch) | |
tree | e8bf3a8e4c46c3551d2c31f533965021942e85bc | |
parent | acc55c25c587fef5c7327c5912f3aa50a969ec34 (diff) |
merge revision(s) 35325:
* bignum.c (rb_big2str0): prevent working clone from
GC. [exerb-dev:0578]. patched by MURASE Masamitsu
<masamitsu.murase AT gmail.com> at [exerb-dev:0580]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | bignum.c | 3 | ||||
-rw-r--r-- | version.h | 10 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sat Apr 14 18:51:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * bignum.c (rb_big2str0): prevent working clone from + GC. [exerb-dev:0578]. patched by MURASE Masamitsu + <masamitsu.murase AT gmail.com> at [exerb-dev:0580] + Tue Mar 6 12:05:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/yaml/rubytypes.rb (Exception.yaml_new): fix bug that causes @@ -772,7 +772,7 @@ rb_big2str0(x, base, trim) int base; int trim; { - volatile VALUE t; + VALUE t; BDIGIT *ds; long i, j, hbase; VALUE ss; @@ -847,6 +847,7 @@ rb_big2str0(x, base, trim) if (trim && i == 0 && num == 0) break; } } + RB_GC_GUARD(t); if (trim) {while (s[j] == '0') j++;} i = RSTRING(ss)->len - j; if (RBIGNUM(x)->sign) { @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2012-03-06" +#define RUBY_RELEASE_DATE "2012-04-14" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20120306 -#define RUBY_PATCHLEVEL 360 +#define RUBY_RELEASE_CODE 20120414 +#define RUBY_PATCHLEVEL 361 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2012 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |