From 0ba2ccc51d2d9f09f78ba6094ca44acea5c327bf Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 19 Jun 2015 04:55:01 +0000 Subject: 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 --- ChangeLog | 5 +++++ proc.c | 8 +++++--- test/-ext-/symbol/test_inadvertent_creation.rb | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6d9964785..c3610d8a44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 19 13:54:43 2015 Nobuyoshi Nakada + + * proc.c (rb_mod_define_method): get rid of inadvertent ID + creations at error. + Fri Jun 19 07:58:11 2015 Nobuyoshi Nakada * ext/extmk.rb: if no with-ext option is given, default to diff --git a/proc.c b/proc.c index 530f3e8454..e333048af4 100644 --- a/proc.c +++ b/proc.c @@ -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); diff --git a/test/-ext-/symbol/test_inadvertent_creation.rb b/test/-ext-/symbol/test_inadvertent_creation.rb index c7c8b5ace5..14afc90d74 100644 --- a/test/-ext-/symbol/test_inadvertent_creation.rb +++ b/test/-ext-/symbol/test_inadvertent_creation.rb @@ -63,6 +63,28 @@ module Test_Symbol assert_not_interned_error(cl, :const_defined?, name.to_sym) end + def test_module_define_method_type_error + cl = Class.new + name = noninterned_name + + assert_raise(TypeError) {cl.class_eval {define_method(name, "")}} + assert_not_interned(name) + + assert_raise(TypeError) {cl.class_eval {define_method(name.to_sym, "")}} + assert_not_pinneddown(name) + end + + def test_module_define_method_argument_error + cl = Class.new + name = noninterned_name + + assert_raise(ArgumentError) {cl.class_eval {define_method(name)}} + assert_not_interned(name) + + assert_raise(ArgumentError) {cl.class_eval {define_method(name.to_sym)}} + assert_not_pinneddown(name) + end + def test_respond_to_missing feature5072 = Feature5072 c = Class.new do -- cgit v1.2.3