summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-09 07:15:48 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-09 07:15:48 +0000
commit303cd88d408b7f8b79b0580cf3d552d6e291f5df (patch)
tree7713b5360f47699dc1079ef3475386499f28b8a9
parent0599d7de5844a2f838cdf631b9c88b05010ebe5d (diff)
* vm.c (rb_vm_cref_in_context): Module#define_method in non-class
expression should be public. [Bug #11754] * test/ruby/test_method.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--test/ruby/test_method.rb4
-rw-r--r--vm.c1
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c44cd8c00d..6e200e97d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec 9 16:10:37 2015 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c (rb_vm_cref_in_context): Module#define_method in non-class
+ expression should be public.
+ [Bug #11754]
+
+ * test/ruby/test_method.rb: add a test.
+
Wed Dec 9 15:48:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regcomp.c (onig_chain_link_add): use atomic operation instead of
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 9e20d5cc220..48178c4d7ad 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -924,6 +924,8 @@ class TestMethod < Test::Unit::TestCase
def m1
def m2
end
+
+ self.class.send(:define_method, :m3){} # [Bug #11754]
end
private
end
@@ -933,7 +935,7 @@ class TestMethod < Test::Unit::TestCase
assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort)
MethodInMethodClass.new.m1
- assert_equal([:m1, :m2].sort, MethodInMethodClass.public_instance_methods(false).sort)
+ assert_equal([:m1, :m2, :m3].sort, MethodInMethodClass.public_instance_methods(false).sort)
assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort)
end
end
diff --git a/vm.c b/vm.c
index 23be295fefc..b83595db36b 100644
--- a/vm.c
+++ b/vm.c
@@ -1226,6 +1226,7 @@ rb_vm_cref_in_context(VALUE self, VALUE cbase)
const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
const rb_cref_t *cref;
if (cfp->self != self) return NULL;
+ if (!vm_env_cref_by_cref(cfp->ep)) return NULL;
cref = rb_vm_get_cref(cfp->ep);
if (CREF_CLASS(cref) != cbase) return NULL;
return cref;