fix stackoverflowexception

matthid · matthid · commit 502001e6db4f · 2016-08-26T15:07:12.000+02:00
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -50,6 +50,8 @@ internal static ClassBase GetClass(Type type)
             }
             cb = CreateClass(type);
             cache.Add(type, cb);
+            // Initialize the object later, as this might call this GetClass method recursivly (for example when a nested class inherits its declaring class...)
+            InitClassBase(type, cb);
             return cb;
         }
 
@@ -62,12 +64,6 @@ internal static ClassBase GetClass(Type type)
 
         private static ClassBase CreateClass(Type type)
         {
-            // First, we introspect the managed type and build some class
-            // information, including generating the member descriptors
-            // that we'll be putting in the Python class __dict__.
-
-            ClassInfo info = GetClassInfo(type);
-
             // Next, select the appropriate managed implementation class.
             // Different kinds of types, such as array types or interface
             // types, want to vary certain implementation details to make
@@ -115,6 +111,18 @@ private static ClassBase CreateClass(Type type)
                 impl = new ClassObject(type);
             }
 
+
+            return impl;
+        }
+
+        private static void InitClassBase(Type type, ClassBase impl)
+        {
+            // First, we introspect the managed type and build some class
+            // information, including generating the member descriptors
+            // that we'll be putting in the Python class __dict__.
+
+            ClassInfo info = GetClassInfo(type);
+
             impl.indexer = info.indexer;
 
             // Now we allocate the Python type object to reflect the given
@@ -182,10 +190,8 @@ private static ClassBase CreateClass(Type type)
                 }
             }
 
-            return impl;
         }
 
-
         private static ClassInfo GetClassInfo(Type type)
         {
             ClassInfo ci = new ClassInfo(type);
@@ -353,6 +359,7 @@ private static ClassInfo GetClassInfo(Type type)
                         if (!(tp.IsNestedPublic || tp.IsNestedFamily ||
                               tp.IsNestedFamORAssem))
                             continue;
+                        // Note the given instance might be uninitialized
                         ob = ClassManager.GetClass(tp);
                         ci.members[mi.Name] = ob;
                         continue;
