merges 32227 from trunk into ruby_1_9_2.

--
* vm_insnhelper.c (vm_search_superclass): avoid control frame
  stack overrun. currently super() in Proc created in a method
  defined by Module#define_method raise NoMethodError. [Bug #4881]
* test/ruby/test_method.rb t_super_in_proc_from_define_method):
  add test for it.

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

4 files changed, 28 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ee5dfd7fb..93d09aa21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jun 25 23:45:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (vm_search_superclass): avoid control frame
+	  stack overrun. currently super() in Proc created in a method
+	  defined by Module#define_method raise NoMethodError. [Bug #4881]
+	* test/ruby/test_method.rb t_super_in_proc_from_define_method):
+	  add test for it.
+
 Thu Jun 23 19:30:53 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
 
 	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 3a728e1599..d0eaf6118a 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -211,6 +211,20 @@ class TestMethod < Test::Unit::TestCase
     end
   end
 
+  def test_super_in_proc_from_define_method
+    c1 = Class.new {
+      def m
+        :m1
+      end
+    }
+    c2 = Class.new(c1) { define_method(:m) { Proc.new { super() } } }
+    # c2.new.m.call should return :m1, but currently it raise NoMethodError.
+    # see [Bug #4881] and [Bug #3136]
+    assert_raise(NoMethodError) {
+      c2.new.m.call
+    }
+  end
+
   def test_clone
     o = Object.new
     def o.foo; :foo; end
diff --git a/version.h b/version.h
index 1637f4f394..82ca90c367 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 292
+#define RUBY_PATCHLEVEL 293
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 6b78394ca2..26664ddc13 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1401,9 +1401,14 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
 	}
 
 	while (lcfp->iseq != ip) {
+	    rb_thread_t *th = GET_THREAD();
 	    VALUE *tdfp = GET_PREV_DFP(lcfp->dfp);
 	    while (1) {
 		lcfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(lcfp);
+		if (RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, lcfp)) {
+		    rb_raise(rb_eNoMethodError,
+			     "super called outside of method");
+		}
 		if (lcfp->dfp == tdfp) {
 		    break;
 		}