summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 13:55:17 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 13:55:17 +0000
commite84f80761840000dd84ecd30d97946832e44dd97 (patch)
tree09906d81a9bf245b99900330eff8043d1fd78534 /version.h
parent29eae8b1e9a5142b30250d0a9cc738b4ce94eadc (diff)
merge revision(s) 64799,64800,64801: [Backport #15105]
fix typo. * vm_exec.h (DEBUG_END_INSN()): use `ec` instead of `th`. This macro is used when `VMDEBUG > 0`. escape all env properly. * vm_backtrace.c (rb_debug_inspector_open): escape all env using `rb_vm_stack_to_heap()` before making bindings. [Bug #15105] There is a complicated story of this issue: Without this patch, IFUNC frame does not escaped. A IFUNC frame points to CFUNC ep as previous ep. However, CFUNC ep can be escaped because of making bindings of Ruby level frames. IFUNC's ep can points to invalidated ep and `rb_iter_break()` will fail. This is why `any?` fails. * test/-ext-/debug/test_debug.rb: add a test. * remove trailing spaces. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66074 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 e88b6ab32e..cc5f50a49b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.4"
#define RUBY_RELEASE_DATE "2018-11-28"
-#define RUBY_PATCHLEVEL 113
+#define RUBY_PATCHLEVEL 114
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 11