summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-06 15:26:34 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-06 15:26:34 +0000
commitb09eabd430d92cdae011bb7ad08a3300049a4392 (patch)
tree40a78e2468bfb94b187249f0fd8c1225209eacca
parent141179186bd28a712cd771fb60fa9a5d5b275e7b (diff)
* class.c (rb_class_init_copy): raise a TypeError if the argument is
BasicObject. [ruby-core:27060] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--class.c3
-rw-r--r--test/ruby/test_class.rb2
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c91921fd564..b51a4050e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 7 00:23:21 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * class.c (rb_class_init_copy): raise a TypeError if the argument is
+ BasicObject. [ruby-core:27060]
+
Sat Feb 6 23:37:11 2010 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (initialize): set @sock to a NullSocket instance to
diff --git a/class.c b/class.c
index 6674ae1a9df..fed2edf4ee4 100644
--- a/class.c
+++ b/class.c
@@ -180,6 +180,9 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
VALUE
rb_class_init_copy(VALUE clone, VALUE orig)
{
+ if (orig == rb_cBasicObject) {
+ rb_raise(rb_eTypeError, "can't copy the root class");
+ }
if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
rb_raise(rb_eTypeError, "already initialized class");
}
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index b444d4e8abb..3a0ced8be76 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -181,6 +181,8 @@ class TestClass < Test::Unit::TestCase
o = Object.new
c = class << o; self; end
assert_raise(TypeError) { c.dup }
+
+ assert_raise(TypeError) { BasicObject.dup }
end
def test_singleton_class