diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | vm_insnhelper.c | 8 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Thu Jan 23 21:08:16 2014 Shota Fukumori <her@sorah.jp> + + * vm_insnhelper.c (check_match): Fix SEGV with VM_CHECKMATCH_TYPE_CASE + and class of `pattern` has `method_missing` + [Bug #8882] [ruby-core:58606] + Mon Jan 20 01:02:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-01-20" -#define RUBY_PATCHLEVEL 388 +#define RUBY_RELEASE_DATE "2014-01-23" +#define RUBY_PATCHLEVEL 389 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 691f4d1030..ae479100cf 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -935,7 +935,13 @@ check_match(VALUE pattern, VALUE target, enum vm_check_match_type type) case VM_CHECKMATCH_TYPE_CASE: { VALUE defined_class; rb_method_entry_t *me = rb_method_entry_with_refinements(CLASS_OF(pattern), idEqq, &defined_class); - return vm_call0(GET_THREAD(), pattern, idEqq, 1, &target, me, defined_class); + if (me) { + return vm_call0(GET_THREAD(), pattern, idEqq, 1, &target, me, defined_class); + } + else { + /* fallback to funcall (e.g. method_missing) */ + return rb_funcall2(pattern, idEqq, 1, &target); + } } default: rb_bug("check_match: unreachable"); |