diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-07 02:44:24 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-07 02:44:24 +0000 |
| commit | 0f24f944705a3899f57f4c36f0a74d9438a09359 (patch) | |
| tree | 36685f92c3d77042ee7f7422c18f9a316baf08ca /vm_method.c | |
| parent | b361d7d0820592d0cdb2c72a257be0a29c04a4ef (diff) | |
* vm_method.c (rb_redefine_opt_method): use RCLASS_ORIGIN to avoid
SEGV when a module-prepended class is refined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vm_method.c b/vm_method.c index 13174dd38d..6582bd1716 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1415,13 +1415,14 @@ rb_redefine_opt_method(VALUE klass, ID mid) { st_data_t data; rb_method_entry_t *me = 0; + VALUE origin = RCLASS_ORIGIN(klass); - if (!st_lookup(RCLASS_M_TBL(klass), mid, &data) || + if (!st_lookup(RCLASS_M_TBL(origin), mid, &data) || !(me = (rb_method_entry_t *)data) || (!me->def || me->def->type == VM_METHOD_TYPE_UNDEF)) { return; } - rb_vm_check_redefinition_opt_method(me, klass); + rb_vm_check_redefinition_opt_method(me, origin); } void |