From 4ea616b387d50e96bac26ea5dd99812bfc717b03 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Nov 2015 09:28:45 +0000
Subject: [PATCH] vm_method.c: check if frozen [Fix GH-1096]

* vm_method.c (set_method_visibility): should fail if the receiver
  is frozen.  [ruby-core:71489] [Bug #11687]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  5 +++++
 test/ruby/test_module.rb | 11 ++++++++++-
 vm_method.c              |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c92acecbd3..6912d1c498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 15 18:28:43 2015  Kenichi Kamiya  <kachick1@gmail.com>
+
+	* vm_method.c (set_method_visibility): should fail if the receiver
+	  is frozen.  [ruby-core:71489] [Bug #11687]
+
 Sat Nov 14 22:15:07 2015  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/lib/socket.rb: Specify frozen_string_literal: true.
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 19cf418cf1..dbbeca850d 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -624,13 +624,22 @@ class TestModule < Test::Unit::TestCase
   end
 
   def test_freeze
-    m = Module.new
+    m = Module.new do
+      def self.baz; end
+      def bar; end
+    end
     m.freeze
     assert_raise(RuntimeError) do
       m.module_eval do
         def foo; end
       end
     end
+    assert_raise(RuntimeError) do
+      m.__send__ :private, :bar
+    end
+    assert_raise(RuntimeError) do
+      m.private_class_method :baz
+    end
   end
 
   def test_attr_obsoleted_flag
diff --git a/vm_method.c b/vm_method.c
index 1bc499f1b5..c88167434b 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -1552,6 +1552,7 @@ set_method_visibility(VALUE self, int argc, const VALUE *argv, rb_method_visibil
 {
     int i;
 
+    rb_check_frozen(self);
     if (argc == 0) {
 	rb_warning("%"PRIsVALUE" with no argument is just ignored",
 		   QUOTE_ID(rb_frame_callee()));