From f8e0e1647eb80d2b6e84b1ecceaaf86649719a96 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 17 Oct 2013 08:44:26 +0000
Subject: * vm_insnhelper.c (vm_call_method): set ci->me to 0 when the  
 original method of a refined method is undef to avoid SEGV.

* vm_method.c (rb_method_entry_without_refinements): return 0 when
  the original method of a refined method is undef to avoid SEGV.

* test/ruby/test_refinement.rb: related test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                    | 10 +++++++++
 test/ruby/test_refinement.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++
 vm_insnhelper.c              |  8 +++++++-
 vm_method.c                  |  7 ++++++-
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2ac5f49a7..318fd1b0d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 17 17:43:00 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the
+	  original method of a refined method is undef to avoid SEGV.
+
+	* vm_method.c (rb_method_entry_without_refinements): return 0 when
+	  the original method of a refined method is undef to avoid SEGV.
+
+	* test/ruby/test_refinement.rb: related test.
+
 Thu Oct 17 17:38:36 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c, internal.h: rename ruby_xsizefree/realloc to
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 31234ed00b..98dae15f00 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1059,6 +1059,54 @@ class TestRefinement < Test::Unit::TestCase
     INPUT
   end
 
+  def test_refine_undefed_method_and_call
+    assert_in_out_err([], <<-INPUT, ["NoMethodError"], [])
+      class Foo
+        def foo
+        end
+
+        undef foo
+      end
+
+      module FooExt
+        refine Foo do
+          def foo
+          end
+        end
+      end
+
+      begin
+        Foo.new.foo
+      rescue => e
+        p e.class
+      end
+    INPUT
+  end
+
+  def test_refine_undefed_method_and_send
+    assert_in_out_err([], <<-INPUT, ["NoMethodError"], [])
+      class Foo
+        def foo
+        end
+
+        undef foo
+      end
+
+      module FooExt
+        refine Foo do
+          def foo
+          end
+        end
+      end
+
+      begin
+        Foo.new.send(:foo)
+      rescue => e
+        p e.class
+      end
+    INPUT
+  end
+
   private
 
   def eval_using(mod, s)
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index fc9491f312..8fd6b1ef27 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1903,7 +1903,13 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
 	      no_refinement_dispatch:
 		if (ci->me->def->body.orig_me) {
 		    ci->me = ci->me->def->body.orig_me;
-		    goto normal_method_dispatch;
+		    if (UNDEFINED_METHOD_ENTRY_P(ci->me)) {
+			ci->me = 0;
+			goto start_method_dispatch;
+		    }
+		    else {
+			goto normal_method_dispatch;
+		    }
 		}
 		else {
 		    klass = ci->me->klass;
diff --git a/vm_method.c b/vm_method.c
index 0066c17c8a..30bd6b6a1f 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -670,7 +670,12 @@ rb_method_entry_without_refinements(VALUE klass, ID id,
     }
     if (defined_class_ptr)
 	*defined_class_ptr = defined_class;
-    return me;
+    if (UNDEFINED_METHOD_ENTRY_P(me)) {
+	return 0;
+    }
+    else {
+	return me;
+    }
 }
 
 static void
-- 
cgit v1.2.3