diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-19 04:55:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-19 04:55:01 +0000 |
commit | adb1615877acb4b7b39889bb58bedc05aa7a2a1b (patch) | |
tree | cc84fcf6377f2814257615440d940c7adfa31212 /proc.c | |
parent | 80bf4db55c0bfd9512f9c09f36343bc1881e77af (diff) | |
download | ruby-adb1615877acb4b7b39889bb58bedc05aa7a2a1b.tar.gz |
proc.c: inadvertent ID
* proc.c (rb_mod_define_method): get rid of inadvertent ID
creations at error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1657,6 +1657,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) { ID id; VALUE body; + VALUE name; const rb_cref_t *cref = rb_vm_cref_in_context(mod, mod); const rb_scope_visibility_t default_scope_visi = {METHOD_VISI_PUBLIC, FALSE}; const rb_scope_visibility_t *scope_visi = &default_scope_visi; @@ -1666,13 +1667,13 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) scope_visi = CREF_SCOPE_VISI(cref); } + rb_check_arity(argc, 1, 2); + name = argv[0]; + id = rb_check_id(&name); if (argc == 1) { - id = rb_to_id(argv[0]); body = rb_block_lambda(); } else { - rb_check_arity(argc, 1, 2); - id = rb_to_id(argv[0]); body = argv[1]; is_method = rb_obj_is_method(body) != Qfalse; if (!is_method && !rb_obj_is_proc(body)) { @@ -1681,6 +1682,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) rb_obj_classname(body)); } } + if (!id) id = rb_to_id(name); if (is_method) { struct METHOD *method = (struct METHOD *)DATA_PTR(body); |