summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-10-27 07:48:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-10-27 07:48:53 +0000
commit04b031656add2a8c9f7f2136e4fc7fc16c9ac901 (patch)
tree2998e533888161f911a99d87e7ca7021b3ce3f13 /version.h
parentad559b5c1cbaa50273c8063951a4e64a9f2c1fe7 (diff)
merge revision(s) 56252,56254: [Backport #12743]
* eval_intern.h (TH_PUSH_TAG): Initialize struct rb_vm_tag::tag with Qundef rather than 0 which is equal to Qfalse. Since Kernel#throw(obj) searches a tag with rb_vm_tag::tag == obj, throw(false) can accidentally find an unrelated tag which is not created by Kernel#catch. [ruby-core:77229] [Bug #12743] * test/ruby/test_exception.rb (test_throw_false): Add a test case for this. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index cab66e0035..ee3080693e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-10-27"
-#define RUBY_PATCHLEVEL 383
+#define RUBY_PATCHLEVEL 384
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 10