From 63c3b2d283a482b96b20fa8d78f3098786123a68 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Nov 2009 01:13:54 +0000
Subject: [PATCH] * vm_method.c (rb_undef): should raise TypeError if klass is
 nil.   1.instance_eval { undef to_s } causes SEGV before this fix. *
 test/ruby/test_undef.rb: new tests for undef.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 7 +++++++
 vm_method.c | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7cd75bf441..766b9e8320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 18 10:12:34 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_undef): should raise TypeError if klass is nil.
+	  1.instance_eval { undef to_s } causes SEGV before this fix.
+
+	* test/ruby/test_undef.rb: new tests for undef.
+
 Wed Nov 18 08:41:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_utf8_nth): fixed overrun.  [ruby-core:26787]
diff --git a/vm_method.c b/vm_method.c
index d1c68b58f3..215db50080 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -574,6 +574,9 @@ rb_undef(VALUE klass, ID id)
 {
     rb_method_entry_t *me;
 
+    if (NIL_P(klass)) {
+	rb_raise(rb_eTypeError, "no class to undef method");
+    }
     if (rb_vm_cbase() == rb_cObject && klass == rb_cObject) {
 	rb_secure(4);
     }