diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-20 09:34:55 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-20 09:34:55 +0000 |
commit | 4e0632ad5ddf9f5f94ce38142811ab926d91fa3f (patch) | |
tree | 10c06d8d2307842257f7856318b80829750eb3ea | |
parent | c3fcb13ce03a63d333ada192f7c1b59bb26f66d8 (diff) |
merge revision(s) 38095: [Backport #7456]
* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
on Windows 8. Without cast, 0 might be non zero value at higher bits
in rb_ary_new3().
[ruby-core:50258] [Bug #7456]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Thu Dec 20 18:34:38 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw + on Windows 8. Without cast, 0 might be non zero value at higher bits + in rb_ary_new3(). + [ruby-core:50258] [Bug #7456] + Wed Dec 19 21:24:40 2012 NARUSE, Yui <naruse@ruby-lang.org> * io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438] @@ -251,7 +251,7 @@ r_value(VALUE value) (rb_ary_push(iseq->compile_data->catch_table_ary, \ rb_ary_new3(5, (type), \ (VALUE)(ls) | 1, (VALUE)(le) | 1, \ - (iseqv), (VALUE)(lc) | 1))) + (VALUE)(iseqv), (VALUE)(lc) | 1))) /* compile node */ #define COMPILE(anchor, desc, node) \ @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 346 +#define RUBY_PATCHLEVEL 347 -#define RUBY_RELEASE_DATE "2012-12-19" +#define RUBY_RELEASE_DATE "2012-12-20" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" |