* hash.c (rb_hash_become): Hash#become should check added

  self-assignment.

* class.c (rb_make_metaclass): metaclass of a superclass may be
  NULL at boot time.


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

1 files changed, 6 insertions, 1 deletions

diff --git a/class.c b/class.c
index d55c37e99..316118bfe 100644
--- a/class.c
+++ b/class.c
@@ -152,7 +152,12 @@ rb_make_metaclass(obj, super)
 	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
     }
     else {
-	RBASIC(klass)->klass = RBASIC(rb_class_real(super))->klass;
+	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
+
+	/* metaclass of a superclass may be NULL at boot time */
+	if (metasuper) {
+	    RBASIC(klass)->klass;
+	}
     }
 
     return klass;