* vm_insnhelper.c (vm_call_method): protected singleton methods of

  an object should not be able to called from other instances of the
  class of the object.  [ruby-core:26761]
* vm_eval.c (rb_method_call_status): ditto.
* test/ruby/test_module.rb (test_protected_singleton_method): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 36 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 754c91411d..98412d78af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov 16 15:51:53 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): protected singleton methods of
+	  an object should not be able to called from other instances of the
+	  class of the object.  [ruby-core:26761]
+	
+	* vm_eval.c (rb_method_call_status): ditto.
+
+	* test/ruby/test_module.rb (test_protected_singleton_method): ditto.
+
 Mon Nov 16 14:03:53 2009  wanabe  <s.wanabe@gmail.com>
 
 	* io.c (read_all): shift read buffer if exception occured.
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 59c965325f..92b2f7b561 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -854,4 +854,28 @@ class TestModule < Test::Unit::TestCase
     end
     assert_equal("", stderr)
   end
+
+  def test_protected_singleton_method
+    klass = Class.new
+    x = klass.new
+    class << x
+      protected
+
+      def foo
+      end
+    end
+    assert_raise(NoMethodError) do
+      x.foo
+    end
+    klass.send(:define_method, :bar) do
+      x.foo
+    end
+    assert_nothing_raised do
+      x.bar
+    end
+    y = klass.new
+    assert_raise(NoMethodError) do
+      y.bar
+    end
+  end
 end
diff --git a/vm_eval.c b/vm_eval.c
index e24f1c3d79..a0e35bd717 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -343,7 +343,7 @@ rb_method_call_status(rb_thread_t *th, rb_method_entry_t *me, call_type scope, V
 		if (self == Qundef) {
 		    self = th->cfp->self;
 		}
-		if (!rb_obj_is_kind_of(self, rb_class_real(defined_class))) {
+		if (!rb_obj_is_kind_of(self, defined_class)) {
 		    return NOEX_PROTECTED;
 		}
 	    }
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 0660c7dd03..3654e39890 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -623,7 +623,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp,
 		    defined_class = RBASIC(defined_class)->klass;
 		}
 
-		if (!rb_obj_is_kind_of(cfp->self, rb_class_real(defined_class))) {
+		if (!rb_obj_is_kind_of(cfp->self, defined_class)) {
 		    val = vm_method_missing(th, id, recv, num, blockptr, NOEX_PROTECTED);
 		}
 		else {