summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--compile.c2
-rw-r--r--version.h6
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b7287a7c0a..ef5c08a9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
diff --git a/compile.c b/compile.c
index 74c9ef98f5..f78d13db78 100644
--- a/compile.c
+++ b/compile.c
@@ -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) \
diff --git a/version.h b/version.h
index 842f16bdd7..2ee7ca9198 100644
--- a/version.h
+++ b/version.h
@@ -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"