diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-23 12:40:52 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-23 12:40:52 +0000 |
| commit | 6136b992d4d4df727fcdb50ef07194a50bac9bd9 (patch) | |
| tree | 7f3066365e24f142ca80eedcb45d712233a4fa3e /vm_insnhelper.c | |
| parent | 24365fb24b4ac7e20556cee2dd842e40008f1ac7 (diff) | |
merge revision(s) 43913: [Backport #8872] [Backport #9175]
* vm_insnhelper.c (check_match): Fix SEGV with VM_CHECKMATCH_TYPE_CASE
and class of `pattern` has `method_missing`
[Bug #8882] [ruby-core:58606]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 8 |
1 files changed, 7 insertions, 1 deletions
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"); |