Check null reference in PropertiesTreeBuilder

pszybiak · Oct 21, 2024 · ae357ad · ae357ad
1 parent 7118351
commit ae357ad
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/openapi2excel/Builders/WorksheetPartsBuilders/PropertiesTreeBuilder.cs b/src/openapi2excel/Builders/WorksheetPartsBuilders/PropertiesTreeBuilder.cs
@@ -25,13 +25,20 @@ public void AddPropertiesTreeForMediaTypes(RowPointer actualRow, IDictionary<str
          Worksheet.Cell(ActualRow, 1).SetTextBold($"Body format: {mediaType.Key}");
          ActualRow.MoveNext();
 
-         using (var _ = new Section(Worksheet, ActualRow))
+         if (mediaType.Value.Schema != null)
          {
-            var columnCount = AddPropertiesTree(ActualRow, mediaType.Value.Schema, options);
-            Worksheet.Cell(bodyFormatRowPointer, 1).SetBackground(columnCount, HeaderBackgroundColor);
-            ActualRow.MovePrev();
+            using (var _ = new Section(Worksheet, ActualRow))
+            {
+               var columnCount = AddPropertiesTree(ActualRow, mediaType.Value.Schema, options);
+               Worksheet.Cell(bodyFormatRowPointer, 1).SetBackground(columnCount, HeaderBackgroundColor);
+               ActualRow.MovePrev();
+            }
+            ActualRow.MoveNext(2);
+         }
+         else
+         {
+            ActualRow.MoveNext();
          }
-         ActualRow.MoveNext(2);
       }
    }
 
@@ -53,8 +60,11 @@ protected bool CorrectRootElementIfArray(OpenApiSchema schema)
       return true;
    }
 
-   protected void AddProperties(OpenApiSchema schema, int level, OpenApiDocumentationOptions options)
+   protected void AddProperties(OpenApiSchema? schema, int level, OpenApiDocumentationOptions options)
    {
+      if (schema == null)
+         return;
+
       if (schema.Items != null)
       {
          AddPropertiesForArray(schema, level, options);
@@ -87,11 +97,11 @@ private void AddPropertiesForArray(OpenApiSchema schema, int level, OpenApiDocum
       }
    }
 
-   protected void AddProperty(string name, OpenApiSchema schema, bool required, int level, OpenApiDocumentationOptions options)
+   protected void AddProperty(string name, OpenApiSchema? schema, bool required, int level, OpenApiDocumentationOptions options)
    {
-      if (level >= options.MaxDepth)
+      if (schema == null || level >= options.MaxDepth)
       {
-          return;
+         return;
       }
 
       AddPropertyRow(name, schema, required, level++);