Prevent stack overflow (fixes #329)

mganss · Jun 7, 2022 · cf0d266 · cf0d266
1 parent b474f8b
commit cf0d266
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/XmlSchemaClassGenerator.Tests/xsd/simple/recursive.xsd b/XmlSchemaClassGenerator.Tests/xsd/simple/recursive.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema id="Exceptions"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="unqualified"
+ elementFormDefault="qualified"
+ targetNamespace="http://schemas.nsc.co.uk/exceptions"
+ xmlns:local="http://schemas.nsc.co.uk/exceptions">
+
+ <complexType name="ExceptionBase">
+ <attribute name="Message"/>
+ </complexType>
+
+ <complexType name="ArgumentNullException" >
+ <complexContent>
+ <extension base="local:ExceptionBase">
+ <attribute name="Argument"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="InvalidOperationException" >
+ <complexContent>
+ <extension base="local:ExceptionBase">
+ <attribute name="Operation"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="StackOverflowException" >
+ <complexContent>
+ <extension base="local:ExceptionBase">
+ <attribute name="Method"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="Exception" type="local:ExceptionBase" abstract="true" substitutionGroup="local:Exception"/>
+ <element name="ArgumentNull" type="local:ArgumentNullException" substitutionGroup="local:Exception"/>
+ <element name="InvalidOperation" type="local:InvalidOperationException" substitutionGroup="local:Exception"/>
+ <element name="StackOverflow" type="local:StackOverflowException" substitutionGroup="local:Exception"/>
+
+ <element name="Exceptions">
+ <complexType>
+ <sequence>
+ <element minOccurs="0" maxOccurs="unbounded" ref="local:Exception"/>
+ </sequence>
+ </complexType>
+ </element>
+</schema>
diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -380,7 +380,7 @@ private IEnumerable<Substitute> GetSubstitutedElements(XmlQualifiedName name)
  {
  if (SubstitutionGroups.TryGetValue(name, out var substitutes))
  {
- foreach (var substitute in substitutes)
+ foreach (var substitute in substitutes.Where(s => s.Element.QualifiedName != name))
  {
  yield return substitute;
  foreach (var recursiveSubstitute in GetSubstitutedElements(substitute.Element.QualifiedName))