* variable.c (rb_copy_generic_ivar): remove old generic instance

	  variable table if it existes.

	* class.c (rb_make_metaclass): metaclass of a metaclass is a
	  metaclass itself.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/io.c b/io.c
index 7de74befd..28cb8a51c 100644
--- a/io.c
+++ b/io.c
@@ -177,6 +177,7 @@ rb_io_taint_check(io)
 {
     if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
+    rb_check_frozen(io);
     return io;
 }
 
@@ -2270,6 +2271,7 @@ rb_io_become(clone, io)
     char *mode;
 
     io = rb_io_get_io(io);
+    if (clone == io) return clone;
     GetOpenFile(io, orig);
     MakeOpenFile(clone, fptr);